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

Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

Browse Source 
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-28 22:23:01 +02:00
parent 56cc754c76 9301486408
commit f30a8154ab
5 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libavformat/dump.c
View File

@@ -29,6 +29,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/avstring.h"
#include "libavutil/replaygain.h"
#include "libavutil/stereo3d.h"
#include "avformat.h"
@@ -244,6 +245,51 @@ static void dump_replaygain(void *ctx, AVPacketSideData *sd)
print_peak(ctx, "album peak", rg->album_peak);
}
static void dump_stereo3d(void *ctx, AVPacketSideData *sd)
{
AVStereo3D *stereo;
if (sd->size < sizeof(*stereo)) {
av_log(ctx, AV_LOG_INFO, "invalid data");
return;
}
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;
}
if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
av_log(ctx, AV_LOG_INFO, " (inverted)");
}
static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
{
int i;
@@ -277,6 +323,10 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
av_log(ctx, AV_LOG_INFO, "displaymatrix: rotation of %.2f degrees",
av_display_rotation_get((int32_t *)sd.data));
break;
case AV_PKT_DATA_STEREO3D:
av_log(ctx, AV_LOG_INFO, "stereo3d: ");
dump_stereo3d(ctx, &sd);
break;
default:
av_log(ctx, AV_LOG_WARNING,
"unknown side data type %d (%d bytes)", sd.type, sd.size);