---
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 6 ++++++
libavcodec/version.h | 2 +-
libavformat/dump.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 4d42609..a037eb5 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2014-08-09
API changes, most recent first:
+2014-08-xx - xxxxxxx - lavc 56.1.0 - avcodec.h
+ Add AV_PKT_DATA_STEREO3D to export conteiner-level stereo3d information.
+
2014-08-xx - xxxxxxx - lavu 54.2.0 - stereo3d.h
Add two anaglyph types and multistream mode to stereo3d api.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 93aad35..14440fe 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -911,6 +911,12 @@ enum AVPacketSideDataType {
* See libavutil/display.h for a detailed description of the data.
*/
AV_PKT_DATA_DISPLAYMATRIX,
+
+ /*
+ * This side data should be associated with a video stream and contains
+ * Stereoscopic 3D information in form of the AVStereo3D struct.
+ */
+ AV_PKT_DATA_STEREO3D,
};
typedef struct AVPacketSideData {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b42b970..8cc2fb0 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 0
+#define LIBAVCODEC_VERSION_MINOR 1
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavformat/dump.c b/libavformat/dump.c
index cdf2da1..27b85ff 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -27,6 +27,7 @@
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/replaygain.h"
+#include "libavutil/stereo3d.h"
#include "avformat.h"
@@ -229,6 +230,60 @@ 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;
+ case AV_STEREO3D_MULTIVIEW:
+ av_log(ctx, AV_LOG_INFO, "multiple streams");
+ break;
+ case AV_STEREO3D_ANAGLYPH_CYAN_RED:
+ av_log(ctx, AV_LOG_INFO, "anaglyph (cyan/red)");
+ break;
+ case AV_STEREO3D_ANAGLYPH_GREEN_MAGENTA:
+ av_log(ctx, AV_LOG_INFO, "anaglyph (green/magenta");
+ 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;
@@ -262,6 +317,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);
--
1.8.5.2 (Apple Git-48)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
