* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a': avcodec: Deprecate dtg_active_format field in favor of avframe side-data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/mpeg12dec.c libavcodec/version.h libavfilter/vf_showinfo.c libavutil/frame.h libavutil/version.h
Unified · Split
| @@ -15,9 +15,9 @@ 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 | 18 | 2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h |
| 19 | 2014-08-04 - xxxxxxx - lavu 52.95.100 - frame.h | 19 | 2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h |
| 20 | Deprecate AVCodecContext.dtg_active_format and use side-data instead | 20 | Deprecate AVCodecContext.dtg_active_format and use side-data instead. |
| 21 | 21 | ||
| 22 | 2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h | 22 | 2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h |
| 23 | Add get_pixels() to AVDCT | 23 | Add get_pixels() to AVDCT |
| @@ -1698,7 +1698,7 @@ typedef struct AVCodecContext { · 1697 unmodified lines | |||
| 1698 | * | 1698 | * |
| 1699 | * - encoding: unused | 1699 | * - encoding: unused |
| 1700 | * - decoding: Set by decoder. | 1700 | * - decoding: Set by decoder. |
| 1701 | * @deprecated Deprecated in favour of AVSideData | 1701 | * @deprecated Deprecated in favor of AVSideData |
| 1702 | */ | 1702 | */ |
| 1703 | attribute_deprecated int dtg_active_format; | 1703 | attribute_deprecated int dtg_active_format; |
| 1704 | #define FF_DTG_AFD_SAME 8 | 1704 | #define FF_DTG_AFD_SAME 8 |
| @@ -1708,7 +1708,7 @@ typedef struct AVCodecContext { · 3 unmodified lines | |||
| 1708 | #define FF_DTG_AFD_4_3_SP_14_9 13 | 1708 | #define FF_DTG_AFD_4_3_SP_14_9 13 |
| 1709 | #define FF_DTG_AFD_16_9_SP_14_9 14 | 1709 | #define FF_DTG_AFD_16_9_SP_14_9 14 |
| 1710 | #define FF_DTG_AFD_SP_4_3 15 | 1710 | #define FF_DTG_AFD_SP_4_3 15 |
| 1711 | #endif | 1711 | #endif /* FF_API_AFD */ |
| 1712 | 1712 | ||
| 1713 | /** | 1713 | /** |
| 1714 | * maximum motion estimation search range in subpel units | 1714 | * maximum motion estimation search range in subpel units |
| @@ -1663,13 +1663,13 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) · 1662 unmodified lines | |||
| 1663 | } | 1663 | } |
| 1664 | 1664 | ||
| 1665 | if (s1->has_afd) { | 1665 | if (s1->has_afd) { |
| 1666 | AVFrameSideData *sd = av_frame_new_side_data( | 1666 | AVFrameSideData *sd = |
| 1667 | s->current_picture_ptr->f, AV_FRAME_DATA_AFD, | 1667 | av_frame_new_side_data(s->current_picture_ptr->f, |
| 1668 | 1); | 1668 | AV_FRAME_DATA_AFD, 1); |
| 1669 | if (!sd) | 1669 | if (!sd) |
| 1670 | return AVERROR(ENOMEM); | 1670 | return AVERROR(ENOMEM); |
| 1671 | 1671 | ||
| 1672 | *sd->data = s1->afd; | 1672 | *sd->data = s1->afd; |
| 1673 | s1->has_afd = 0; | 1673 | s1->has_afd = 0; |
| 1674 | } | 1674 | } |
| 1675 | 1675 | ||
| @@ -2278,7 +2278,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, · 602 unmodified lines | |||
| 2278 | { | 2278 | { |
| 2279 | Mpeg1Context *s = avctx->priv_data; | 2279 | Mpeg1Context *s = avctx->priv_data; |
| 2280 | const uint8_t *buf_end = p + buf_size; | 2280 | const uint8_t *buf_end = p + buf_size; |
| 2281 | Mpeg1Context *s1 = avctx->priv_data; | 2281 | Mpeg1Context *s1 = avctx->priv_data; |
| 2282 | 2282 | ||
| 2283 | if (buf_size > 29){ | 2283 | if (buf_size > 29){ |
| 2284 | int i; | 2284 | int i; |
| @@ -2307,9 +2307,9 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, · 22 unmodified lines | |||
| 2307 | return; | 2307 | return; |
| 2308 | #if FF_API_AFD | 2308 | #if FF_API_AFD |
| 2309 | avctx->dtg_active_format = p[0] & 0x0f; | 2309 | avctx->dtg_active_format = p[0] & 0x0f; |
| 2310 | #endif | 2310 | #endif /* FF_API_AFD */ |
| 2311 | s1->has_afd = 1; | 2311 | s1->has_afd = 1; |
| 2312 | s1->afd = p[0] & 0x0f; | 2312 | s1->afd = p[0] & 0x0f; |
| 2313 | } | 2313 | } |
| 2314 | } else if (buf_end - p >= 6 && | 2314 | } else if (buf_end - p >= 6 && |
| 2315 | p[0] == 'J' && p[1] == 'P' && p[2] == '3' && p[3] == 'D' && | 2315 | p[0] == 'J' && p[1] == 'P' && p[2] == '3' && p[3] == 'D' && |
| @@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 147 unmodified lines | |||
| 148 | av_display_rotation_get((int32_t *)sd->data)); | 148 | av_display_rotation_get((int32_t *)sd->data)); |
| 149 | break; | 149 | break; |
| 150 | case AV_FRAME_DATA_AFD: | 150 | case AV_FRAME_DATA_AFD: |
| 151 | av_log(ctx, AV_LOG_INFO, "afd: value of %u", sd->data[0]); | 151 | av_log(ctx, AV_LOG_INFO, "afd: value of %"PRIu8, sd->data[0]); |
| 152 | break; | 152 | break; |
| 153 | default: | 153 | default: |
| 154 | av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", | 154 | av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", |
| @@ -83,21 +83,20 @@ enum AVFrameSideDataType { · 82 unmodified lines | |||
| 83 | */ | 83 | */ |
| 84 | AV_FRAME_DATA_DISPLAYMATRIX, | 84 | AV_FRAME_DATA_DISPLAYMATRIX, |
| 85 | /** | 85 | /** |
| 86 | * Active Format Description data consisting of a single byte as specified in ETSI TS 101 154 | 86 | * Active Format Description data consisting of a single byte as specified |
| 87 | * using AVActiveFormatDescription enum | 87 | * in ETSI TS 101 154 using AVActiveFormatDescription enum. |
| 88 | */ | 88 | */ |
| 89 | AV_FRAME_DATA_AFD, | 89 | AV_FRAME_DATA_AFD, |
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | enum AVActiveFormatDescription | 92 | enum AVActiveFormatDescription { |
| 93 | { | 93 | AV_AFD_SAME = 8, |
| 94 | AV_AFD_SAME = 8, | 94 | AV_AFD_4_3 = 9, |
| 95 | AV_AFD_4_3 = 9, | 95 | AV_AFD_16_9 = 10, |
| 96 | AV_AFD_16_9 = 10, | 96 | AV_AFD_14_9 = 11, |
| 97 | AV_AFD_14_9 = 11, | ||
| 98 | AV_AFD_4_3_SP_14_9 = 13, | 97 | AV_AFD_4_3_SP_14_9 = 13, |
| 99 | AV_AFD_16_9_SP_14_9 = 14, | 98 | AV_AFD_16_9_SP_14_9 = 14, |
| 100 | AV_AFD_SP_4_3 = 15 | 99 | AV_AFD_SP_4_3 = 15, |
| 101 | }; | 100 | }; |
| 102 | 101 | ||
| 103 | typedef struct AVFrameSideData { | 102 | typedef struct AVFrameSideData { |