add dvr option. refine macros of auto headers