Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'

* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
  lavf: Dump the cpb side data information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-16 19:51:02 +00:00
commit 0479cf8530

View File

@ -336,6 +336,22 @@ static void dump_audioservicetype(void *ctx, AVPacketSideData *sd)
}
}
static void dump_cpb(void *ctx, AVPacketSideData *sd)
{
AVCPBProperties *cpb = (AVCPBProperties *)sd->data;
if (sd->size < sizeof(*cpb)) {
av_log(ctx, AV_LOG_INFO, "invalid data");
return;
}
av_log(ctx, AV_LOG_INFO,
"bitrate max/min/avg: %d/%d/%d buffer size: %d vbv_delay: %"PRId64,
cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate,
cpb->buffer_size,
cpb->vbv_delay);
}
static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
{
int i;
@ -380,6 +396,10 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
case AV_PKT_DATA_QUALITY_STATS:
av_log(ctx, AV_LOG_INFO, "quality factor: %d, pict_type: %c", AV_RL32(sd.data), av_get_picture_type_char(sd.data[4]));
break;
case AV_PKT_DATA_CPB_PROPERTIES:
av_log(ctx, AV_LOG_INFO, "cpb: ");
dump_cpb(ctx, &sd);
break;
default:
av_log(ctx, AV_LOG_WARNING,
"unknown side data type %d (%d bytes)", sd.type, sd.size);