lavc: move CODEC_FLAG_MV0 to mpegvideo

Anton Khirnov committed 12 years ago

Commit a2941c81 parent 64841498 files · +31 −5Browse files

Unified · Split

8 files

@@ -13,6 +13,10 @@ libavutil: 2013-12-xx · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2014-04-xx - xxxxxxx - lavc 55.50.3 - avcodec.h
		17	Deprecate CODEC_FLAG_MV0. It is replaced by the flag "mv0" in the
		18	"mpv_flags" private option of the mpegvideo encoders.
		19
16	2014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h	20	2014-04-xx - xxxxxxx - lavc 55.50.2 - avcodec.h
17	Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the	21	Deprecate CODEC_FLAG_GMC. It is replaced by the "gmc" private option of the
18	libxvid encoder.	22	libxvid encoder.

  */
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #endif
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
+#if FF_API_MV0
+/**
+ * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
+ * mpegvideo encoders
+ */
+#define CODEC_FLAG_MV0    0x0040
+#endif
 #if FF_API_INPUT_PRESERVED
 /**
  * @deprecated passing reference-counted frames to the encoders replaces this

 //        if (varc*2 + 200*256 + 50*(s->lambda2>>FF_LAMBDA_SHIFT) > vard){
             mb_type|= CANDIDATE_MB_TYPE_INTER;
             c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16);
-            if(s->flags&CODEC_FLAG_MV0)
+            if (s->mpv_flags & FF_MPV_FLAG_MV0)
                 if(mx || my)
                     mb_type |= CANDIDATE_MB_TYPE_SKIPPED; //FIXME check difference
         }else{
         }
          //FIXME something smarter
         if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //do not try direct mode if it is invalid for this MB
-        if(s->codec_id == AV_CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT && s->flags&CODEC_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy])
+        if (s->codec_id == AV_CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT &&
+            s->mpv_flags & FF_MPV_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy])
             type |= CANDIDATE_MB_TYPE_DIRECT0;
     }

@@ -896,7 +896,8 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int · 895 unmodified lines
896	score_map[0]= dmin;	896	score_map[0]= dmin;
897		897
898	//FIXME precalc first term below?	898	//FIXME precalc first term below?
899	if((s->pict_type == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) \|\| s->flags&CODEC_FLAG_MV0)	899	if ((s->pict_type == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) \|\|
		900	s->mpv_flags & FF_MPV_FLAG_MV0)
900	dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor;	901	dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor;
901		902
902	/* first line */	903	/* first line */

 #define FF_MPV_FLAG_QP_RD        0x0004
 #define FF_MPV_FLAG_CBP_RD       0x0008
 #define FF_MPV_FLAG_NAQ          0x0010
+#define FF_MPV_FLAG_MV0          0x0020
 #define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x)
 #define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
 { "qp_rd",          "Use rate distortion optimization for qp selection", 0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_QP_RD },  0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
 { "cbp_rd",         "use rate distortion optimization for CBP",          0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_CBP_RD }, 0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
 { "naq",            "normalize adaptive quantization",                   0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_NAQ },    0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
+{ "mv0",            "always try a mb with mv=<0,0>",                     0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_MV0 },    0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
 { "luma_elim_threshold",   "single coefficient elimination threshold for luminance (negative values also consider dc coefficient)",\
                                                                       FF_MPV_OFFSET(luma_elim_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS },\
 { "chroma_elim_threshold", "single coefficient elimination threshold for chrominance (negative values also consider dc coefficient)",\

@@ -787,6 +787,13 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) · 786 unmodified lines
787	FF_ENABLE_DEPRECATION_WARNINGS;	787	FF_ENABLE_DEPRECATION_WARNINGS;
788	#endif	788	#endif
789		789
		790	#if FF_API_MV0
		791	FF_DISABLE_DEPRECATION_WARNINGS
		792	if (avctx->flags & CODEC_FLAG_MV0)
		793	s->mpv_flags \|= FF_MPV_FLAG_MV0;
		794	FF_ENABLE_DEPRECATION_WARNINGS
		795	#endif
		796
790	if (avctx->b_frame_strategy == 2) {	797	if (avctx->b_frame_strategy == 2) {
791	for (i = 0; i < s->max_b_frames + 2; i++) {	798	for (i = 0; i < s->max_b_frames + 2; i++) {
792	s->tmp_frames[i] = av_frame_alloc();	799	s->tmp_frames[i] = av_frame_alloc();

 #if FF_API_GMC
 {"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"},
 #endif
+#if FF_API_MV0
 {"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
+#endif
 #if FF_API_INPUT_PRESERVED
 {"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},
 #endif

 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR 50
-#define LIBAVCODEC_VERSION_MICRO  2
+#define LIBAVCODEC_VERSION_MICRO  3
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
 #ifndef FF_API_GMC
 #define FF_API_GMC               (LIBAVCODEC_VERSION_MAJOR < 57)
 #endif
+#ifndef FF_API_MV0
+#define FF_API_MV0               (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
 #endif /* AVCODEC_VERSION_H */

Keyboard shortcuts