Deprecate AFD field and add AFD as side-data

Kieran Kunhya committed 12 years ago

Commit 2a3c36e1 parent 2793b217 files · +51 −4Browse files

Unified · Split

7 files

doc/APIchanges +4 −0
libavcodec/avcodec.h +4 −1
libavcodec/mpeg12dec.c +19 −1
libavcodec/version.h +4 −1
libavfilter/vf_showinfo.c +3 −0
libavutil/frame.h +16 −0
libavutil/version.h +1 −1

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-08-04 - xxxxxxx - lavc 55.72.101 - avcodec.h
		19	2014-08-04 - xxxxxxx - lavu 52.95.100 - frame.h
		20	Deprecate AVCodecContext.dtg_active_format and use side-data instead
		21
18	2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h	22	2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h
19	Add get_pixels() to AVDCT	23	Add get_pixels() to AVDCT
20		24

libavcodec/avcodec.h+4−1

      */
     int me_subpel_quality;
+#if FF_API_AFD
     /**
      * DTG active format information (additional aspect ratio
      * information only used in DVB MPEG-2 transport streams)
      *
      * - encoding: unused
      * - decoding: Set by decoder.
+     * @deprecated Deprecated in favour of AVSideData
      */
-    int dtg_active_format;
+    attribute_deprecated int dtg_active_format;
 #define FF_DTG_AFD_SAME         8
 #define FF_DTG_AFD_4_3          9
 #define FF_DTG_AFD_16_9         10
 #define FF_DTG_AFD_4_3_SP_14_9  13
 #define FF_DTG_AFD_16_9_SP_14_9 14
 #define FF_DTG_AFD_SP_4_3       15
+#endif
     /**
      * maximum motion estimation search range in subpel units

libavcodec/mpeg12dec.c+19−1

     int has_stereo3d;
     uint8_t *a53_caption;
     int a53_caption_size;
+    uint8_t afd;
+    int has_afd;
     int slice_count;
     int save_aspect_info;
     int save_width, save_height, save_progressive_seq;
             *stereo = s1->stereo3d;
             s1->has_stereo3d = 0;
         }
+        if (s1->has_afd) {
+            AVFrameSideData *sd = av_frame_new_side_data(
+                s->current_picture_ptr->f, AV_FRAME_DATA_AFD,
+                1);
+            if (!sd)
+                return AVERROR(ENOMEM);
+            *sd->data = s1->afd;
+            s1->has_afd = 0;
+        }
         if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME))
             ff_thread_finish_setup(avctx);
     } else { // second field
 {
     Mpeg1Context *s = avctx->priv_data;
     const uint8_t *buf_end = p + buf_size;
+    Mpeg1Context *s1   = avctx->priv_data;
     if (buf_size > 29){
         int i;
         if (flags & 0x40) {
             if (buf_end - p < 1)
                 return;
+#if FF_API_AFD
             avctx->dtg_active_format = p[0] & 0x0f;
+#endif
+            s1->has_afd = 1;
+            s1->afd = p[0] & 0x0f;
         }
     } else if (buf_end - p >= 6 &&
                p[0] == 'J' && p[1] == 'P' && p[2] == '3' && p[3] == 'D' &&
             S3D_video_format_type == 0x04 ||
             S3D_video_format_type == 0x08 ||
             S3D_video_format_type == 0x23) {
-            Mpeg1Context *s1   = avctx->priv_data;
             s1->has_stereo3d = 1;

libavcodec/version.h+4−1

 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR  72
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
 #ifndef FF_API_CODEC_NAME
 #define FF_API_CODEC_NAME        (LIBAVCODEC_VERSION_MAJOR < 57)
 #endif
+#ifndef FF_API_AFD
+#define FF_API_AFD               (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
 #endif /* AVCODEC_VERSION_H */

libavfilter/vf_showinfo.c+3−0

             av_log(ctx, AV_LOG_INFO, "displaymatrix: rotation of %.2f degrees",
                    av_display_rotation_get((int32_t *)sd->data));
             break;
+        case AV_FRAME_DATA_AFD:
+            av_log(ctx, AV_LOG_INFO, "afd: value of %u", sd->data[0]);
+            break;
         default:
             av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)",
                    sd->type, sd->size);

libavutil/frame.h+16−0

@@ -82,6 +82,22 @@ enum AVFrameSideDataType { · 81 unmodified lines
82	* See libavutil/display.h for a detailed description of the data.	82	* See libavutil/display.h for a detailed description of the data.
83	*/	83	*/
84	AV_FRAME_DATA_DISPLAYMATRIX,	84	AV_FRAME_DATA_DISPLAYMATRIX,
		85	/**
		86	* Active Format Description data consisting of a single byte as specified in ETSI TS 101 154
		87	* using AVActiveFormatDescription enum
		88	*/
		89	AV_FRAME_DATA_AFD,
		90	};
		91
		92	enum AVActiveFormatDescription
		93	{
		94	AV_AFD_SAME = 8,
		95	AV_AFD_4_3 = 9,
		96	AV_AFD_16_9 = 10,
		97	AV_AFD_14_9 = 11,
		98	AV_AFD_4_3_SP_14_9 = 13,
		99	AV_AFD_16_9_SP_14_9 = 14,
		100	AV_AFD_SP_4_3 = 15
85	};	101	};
86		102
87	typedef struct AVFrameSideData {	103	typedef struct AVFrameSideData {

libavutil/version.h+1−1

@@ -56,7 +56,7 @@ · 55 unmodified lines
56	*/	56	*/
57		57
58	#define LIBAVUTIL_VERSION_MAJOR 52	58	#define LIBAVUTIL_VERSION_MAJOR 52
59	#define LIBAVUTIL_VERSION_MINOR 94	59	#define LIBAVUTIL_VERSION_MINOR 95
60	#define LIBAVUTIL_VERSION_MICRO 100	60	#define LIBAVUTIL_VERSION_MICRO 100
61		61
62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Deprecate AFD field and add AFD as side-data

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code