#include "libavutil/display.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
+#include "libavutil/spherical.h"
#include "libavutil/stereo3d.h"
#include "libavutil/dict.h"
#include "libavutil/libm.h"
for (i = 0; i < stream->nb_side_data; i++) {
const AVPacketSideData* sd = &stream->side_data[i];
AVStereo3D *stereo;
+ AVSphericalMapping *spherical;
switch (sd->type) {
case AV_PKT_DATA_DISPLAYMATRIX:
!!(stereo->flags & AV_STEREO3D_FLAG_INVERT));
probe_object_footer("stereo3d");
break;
+ case AV_PKT_DATA_SPHERICAL:
+ spherical = (AVSphericalMapping *)sd->data;
+ probe_object_header("spherical");
+
+ if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+ probe_str("projection", "equirectangular");
+ else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+ probe_str("projection", "cubemap");
+ else
+ probe_str("projection", "unknown");
+
+ probe_object_header("orientation");
+ probe_int("yaw", (double) spherical->yaw / (1 << 16));
+ probe_int("pitch", (double) spherical->pitch / (1 << 16));
+ probe_int("roll", (double) spherical->roll / (1 << 16));
+ probe_object_footer("orientation");
+
+ probe_object_footer("spherical");
+ break;
}
}
probe_object_footer("sidedata");
API changes, most recent first:
+2016-xx-xx - xxxxxxx - lavc 57.29.0 - avcodec.h
+ Add AV_PKT_DATA_SPHERICAL packet side data to export AVSphericalMapping
+ information from containers.
+
2016-xx-xx - xxxxxxx - lavu 55.30.0 - spherical.h
Add AV_FRAME_DATA_SPHERICAL value, av_spherical_alloc() API and
AVSphericalMapping type to export and describe spherical video properties.
* This side data corresponds to the AVCPBProperties struct.
*/
AV_PKT_DATA_CPB_PROPERTIES,
+
+ /**
+ * This side data should be associated with a video stream and corresponds
+ * to the AVSphericalMapping structure.
+ */
+ AV_PKT_DATA_SPHERICAL,
};
typedef struct AVPacketSideData {
} sd[] = {
{ AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN },
{ AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX },
+ { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL },
{ AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D },
{ AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE },
};
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 28
-#define LIBAVCODEC_VERSION_MICRO 4
+#define LIBAVCODEC_VERSION_MINOR 30
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/replaygain.h"
+#include "libavutil/spherical.h"
#include "libavutil/stereo3d.h"
#include "avformat.h"
cpb->vbv_delay);
}
+static void dump_spherical(void *ctx, AVPacketSideData *sd)
+{
+ AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
+ double yaw, pitch, roll;
+
+ if (sd->size < sizeof(*spherical)) {
+ av_log(ctx, AV_LOG_INFO, "invalid data");
+ return;
+ }
+
+ if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+ av_log(ctx, AV_LOG_INFO, "equirectangular ");
+ else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+ av_log(ctx, AV_LOG_INFO, "cubemap ");
+ else {
+ av_log(ctx, AV_LOG_WARNING, "unknown");
+ return;
+ }
+
+ yaw = ((double)spherical->yaw) / (1 << 16);
+ pitch = ((double)spherical->pitch) / (1 << 16);
+ roll = ((double)spherical->roll) / (1 << 16);
+ av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+}
+
static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
{
int i;
av_log(ctx, AV_LOG_INFO, "cpb: ");
dump_cpb(ctx, &sd);
break;
+ case AV_PKT_DATA_SPHERICAL:
+ av_log(ctx, AV_LOG_INFO, "spherical: ");
+ dump_spherical(ctx, &sd);
+ break;
default:
av_log(ctx, AV_LOG_WARNING,
"unknown side data type %d (%d bytes)", sd.type, sd.size);
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 30
+#define LIBAVUTIL_VERSION_MINOR 29
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \