highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

Browse Source 
* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch
2016-06-23 12:38:51 +02:00
parent 5954730ba3 0c4468dc18
commit abb3cc46d5
5 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/dump.c
View File

@@ -252,6 +252,7 @@ static void dump_replaygain(void *ctx, AVPacketSideData *sd)
static void dump_stereo3d(void *ctx, AVPacketSideData *sd)
{
AVStereo3D *stereo;
const char *name;
if (sd->size < sizeof(*stereo)) {
av_log(ctx, AV_LOG_INFO, "invalid data");
@@ -260,35 +261,7 @@ static void dump_stereo3d(void *ctx, AVPacketSideData *sd)
stereo = (AVStereo3D *)sd->data;
switch (stereo->type) {
case AV_STEREO3D_2D:
av_log(ctx, AV_LOG_INFO, "2D");
break;
case AV_STEREO3D_SIDEBYSIDE:
av_log(ctx, AV_LOG_INFO, "side by side");
break;
case AV_STEREO3D_TOPBOTTOM:
av_log(ctx, AV_LOG_INFO, "top and bottom");
break;
case AV_STEREO3D_FRAMESEQUENCE:
av_log(ctx, AV_LOG_INFO, "frame alternate");
break;
case AV_STEREO3D_CHECKERBOARD:
av_log(ctx, AV_LOG_INFO, "checkerboard");
break;
case AV_STEREO3D_LINES:
av_log(ctx, AV_LOG_INFO, "interleaved lines");
break;
case AV_STEREO3D_COLUMNS:
av_log(ctx, AV_LOG_INFO, "interleaved columns");
break;
case AV_STEREO3D_SIDEBYSIDE_QUINCUNX:
av_log(ctx, AV_LOG_INFO, "side by side (quincunx subsampling)");
break;
default:
av_log(ctx, AV_LOG_WARNING, "unknown");
break;
}
av_log(ctx, AV_LOG_INFO, "%s", av_stereo3d_type_name(stereo->type));
if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
av_log(ctx, AV_LOG_INFO, " (inverted)");