lavc: Add properties field to AVCodecContext.

The new field can hold information about losslessness and closed captions for now.

Carl Eugen Hoyos committed 11 years ago

Commit 8dad2131 parent 7aafac99 files · +36 −1Browse files

Unified · Split

9 files

@@ -15,6 +15,10 @@ libavutil: 2014-08-09 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2015-07-16 - xxxxxxxx - lavc 56.49.100
		19	Add av_codec_get_codec_properties(), FF_CODEC_PROPERTY_LOSSLESS
		20	and FF_CODEC_PROPERTY_CLOSED_CAPTIONS
		21
18	2015-xx-xx - xxxxxxx - lavu 56.15.0	22	2015-xx-xx - xxxxxxx - lavu 56.15.0
19	Add av_version_info().	23	Add av_version_info().
20		24

      * - decoding: set by user through AVOPtions (NO direct access)
      */
     char *codec_whitelist;
+    /*
+     * Properties of the stream that gets decoded
+     * To be accessed through av_codec_get_properties() (NO direct access)
+     * - encoding: unused
+     * - decoding: set by libavcodec
+     */
+    unsigned properties;
+#define FF_CODEC_PROPERTY_LOSSLESS        0x00000001
+#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
 } AVCodecContext;
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
 const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
 void                     av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
+unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
 int  av_codec_get_lowres(const AVCodecContext *avctx);
 void av_codec_set_lowres(AVCodecContext *avctx, int val);

@@ -886,6 +886,7 @@ static void decode_postinit(H264Context *h, int setup_finished) · 885 unmodified lines
886	memcpy(sd->data, h->a53_caption, h->a53_caption_size);	886	memcpy(sd->data, h->a53_caption, h->a53_caption_size);
887	av_freep(&h->a53_caption);	887	av_freep(&h->a53_caption);
888	h->a53_caption_size = 0;	888	h->a53_caption_size = 0;
		889	h->avctx->properties \|= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
889	}	890	}
890		891
891	cur->mmco_reset = h->mmco_reset;	892	cur->mmco_reset = h->mmco_reset;

                 goto fail;
             break;
         case SOF3:
+            s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS;
             s->lossless    = 1;
             s->ls          = 0;
             s->progressive = 0;
                 goto fail;
             break;
         case SOF48:
+            s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS;
             s->lossless    = 1;
             s->ls          = 1;
             s->progressive = 0;

@@ -1685,6 +1685,7 @@ static int mpeg_field_start(MpegEncContext s, const uint8_t buf, int buf_size) · 1684 unmodified lines
1685	if (sd)	1685	if (sd)
1686	memcpy(sd->data, s1->a53_caption, s1->a53_caption_size);	1686	memcpy(sd->data, s1->a53_caption, s1->a53_caption_size);
1687	av_freep(&s1->a53_caption);	1687	av_freep(&s1->a53_caption);
		1688	avctx->properties \|= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
1688	}	1689	}
1689		1690
1690	if (s1->has_stereo3d) {	1691	if (s1->has_stereo3d) {

 MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll)
 MAKE_ACCESSORS(AVCodecContext, codec, uint16_t*, chroma_intra_matrix)
+unsigned av_codec_get_codec_properties(const AVCodecContext *codec)
+{
+    return codec->properties;
+}
 int av_codec_get_max_lowres(const AVCodec *codec)
 {
     return codec->max_lowres;
         if (encode) {
             snprintf(buf + strlen(buf), buf_size - strlen(buf),
                      ", q=%d-%d", enc->qmin, enc->qmax);
+        } else {
+            if (enc->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)
+                snprintf(buf + strlen(buf), buf_size - strlen(buf),
+                         ", Closed Captions");
+            if (enc->properties & FF_CODEC_PROPERTY_LOSSLESS)
+                snprintf(buf + strlen(buf), buf_size - strlen(buf),
+                         ", lossless");
         }
         break;
     case AVMEDIA_TYPE_AUDIO:

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "libavutil/version.h"	29	#include "libavutil/version.h"
30		30
31	#define LIBAVCODEC_VERSION_MAJOR 56	31	#define LIBAVCODEC_VERSION_MAJOR 56
32	#define LIBAVCODEC_VERSION_MINOR 48	32	#define LIBAVCODEC_VERSION_MINOR 49
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 100
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

@@ -733,6 +733,8 @@ static int decode_frame_header(AVCodecContext *ctx, · 732 unmodified lines
733	s->uvac_qdelta = get_bits1(&s->gb) ? get_sbits_inv(&s->gb, 4) : 0;	733	s->uvac_qdelta = get_bits1(&s->gb) ? get_sbits_inv(&s->gb, 4) : 0;
734	s->lossless = s->yac_qi == 0 && s->ydc_qdelta == 0 &&	734	s->lossless = s->yac_qi == 0 && s->ydc_qdelta == 0 &&
735	s->uvdc_qdelta == 0 && s->uvac_qdelta == 0;	735	s->uvdc_qdelta == 0 && s->uvac_qdelta == 0;
		736	if (s->lossless)
		737	ctx->properties \|= FF_CODEC_PROPERTY_LOSSLESS;
736		738
737	/* segmentation header info */	739	/* segmentation header info */
738	s->segmentation.ignore_refmap = 0;	740	s->segmentation.ignore_refmap = 0;

@@ -1417,6 +1417,7 @@ static int webp_decode_frame(AVCodecContext avctx, void data, int *got_frame, · 1416 unmodified lines
1417	chunk_size, 0);	1417	chunk_size, 0);
1418	if (ret < 0)	1418	if (ret < 0)
1419	return ret;	1419	return ret;
		1420	avctx->properties \|= FF_CODEC_PROPERTY_LOSSLESS;
1420	}	1421	}
1421	bytestream2_skip(&gb, chunk_size);	1422	bytestream2_skip(&gb, chunk_size);
1422	break;	1423	break;

Keyboard shortcuts