#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/replaygain.h"
+#include "libavutil/stereo3d.h"
#include "avformat.h"
{
uint64_t v = lrintf(d * 100);
if (v % 100)
- av_log(NULL, AV_LOG_INFO, ", %3.2f %s", d, postfix);
+ av_log(NULL, AV_LOG_INFO, "%3.2f %s", d, postfix);
else if (v % (100 * 1000))
- av_log(NULL, AV_LOG_INFO, ", %1.0f %s", d, postfix);
+ av_log(NULL, AV_LOG_INFO, "%1.0f %s", d, postfix);
else
- av_log(NULL, AV_LOG_INFO, ", %1.0fk %s", d / 1000, postfix);
+ av_log(NULL, AV_LOG_INFO, "%1.0fk %s", d / 1000, postfix);
}
static void dump_metadata(void *ctx, AVDictionary *m, const char *indent)
channels = AV_RL32(data);
data += 4;
size -= 4;
- av_log(ctx, AV_LOG_INFO, "channel count %d, ", channels);
+ av_log(ctx, AV_LOG_INFO, "channel count %"PRIu32", ", channels);
}
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) {
if (size < 8)
sample_rate = AV_RL32(data);
data += 4;
size -= 4;
- av_log(ctx, AV_LOG_INFO, "sample_rate %d, ", sample_rate);
+ av_log(ctx, AV_LOG_INFO, "sample_rate %"PRIu32", ", sample_rate);
}
if (flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) {
if (size < 8)
height = AV_RL32(data);
data += 4;
size -= 4;
- av_log(ctx, AV_LOG_INFO, "width %d height %d", width, height);
+ av_log(ctx, AV_LOG_INFO, "width %"PRIu32" height %"PRIu32, width, height);
}
return;
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;
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);
char buf[256];
int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
AVStream *st = ic->streams[i];
- int g = av_gcd(st->time_base.num, st->time_base.den);
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
avcodec_string(buf, sizeof(buf), st->codec, is_output);
- av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i);
+ av_log(NULL, AV_LOG_INFO, " Stream #%d:%d", index, i);
/* the pid is an important information, so we display it */
/* XXX: add a generic system */
if (lang)
av_log(NULL, AV_LOG_INFO, "(%s)", lang->value);
av_log(NULL, AV_LOG_DEBUG, ", %d, %d/%d", st->codec_info_nb_frames,
- st->time_base.num / g, st->time_base.den / g);
+ st->time_base.num, st->time_base.den);
av_log(NULL, AV_LOG_INFO, ": %s", buf);
if (st->sample_aspect_ratio.num && // default
}
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
- if (st->avg_frame_rate.den && st->avg_frame_rate.num)
- print_fps(av_q2d(st->avg_frame_rate), "fps");
- if (st->time_base.den && st->time_base.num)
- print_fps(1 / av_q2d(st->time_base), "tbn");
- if (st->codec->time_base.den && st->codec->time_base.num)
+ int fps = st->avg_frame_rate.den && st->avg_frame_rate.num;
+ int tbn = st->time_base.den && st->time_base.num;
+ int tbc = st->codec->time_base.den && st->codec->time_base.num;
+
+ if (fps || tbn || tbc)
+ av_log(NULL, AV_LOG_INFO, "\n ");
+ if (fps)
+ print_fps(av_q2d(st->avg_frame_rate), tbn || tbc ? "fps, " : "fps");
+ if (tbn)
+ print_fps(1 / av_q2d(st->time_base), tbc ? "tbn, " : "tbn");
+ if (tbc)
print_fps(1 / av_q2d(st->codec->time_base), "tbc");
}
for (i = 0; i < ic->nb_chapters; i++) {
AVChapter *ch = ic->chapters[i];
- av_log(NULL, AV_LOG_INFO, " Chapter #%d.%d: ", index, i);
+ av_log(NULL, AV_LOG_INFO, " Chapter #%d:%d: ", index, i);
av_log(NULL, AV_LOG_INFO,
"start %f, ", ch->start * av_q2d(ch->time_base));
av_log(NULL, AV_LOG_INFO,