generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webm{dec,enc}.cc,debug_util.c: apply clang-format

Browse Source 
top-level *.cc were missed in the original change
debug_util.c was checked in with some warnings

Change-Id: I72999bf94d734ffc127bf6f96a8d17f9c313d5a0
This commit is contained in:
clang-format
2016-08-12 15:10:25 -07:00
committed by James Zern
parent d9f9a34bb1
commit 01f4c71719
3 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
webmenc.cc
View File

@@ -23,8 +23,7 @@ const int kVideoTrackNumber = 1;
void write_webm_file_header(struct WebmOutputContext *webm_ctx,
const vpx_codec_enc_cfg_t *cfg,
const struct vpx_rational *fps,
stereo_format_t stereo_fmt,
unsigned int fourcc,
stereo_format_t stereo_fmt, unsigned int fourcc,
const struct VpxRational *par) {
mkvmuxer::MkvWriter *const writer = new mkvmuxer::MkvWriter(webm_ctx->stream);
mkvmuxer::Segment *const segment = new mkvmuxer::Segment();
@@ -43,34 +42,23 @@ void write_webm_file_header(struct WebmOutputContext *webm_ctx,
const uint64_t video_track_id =
segment->AddVideoTrack(static_cast<int>(cfg->g_w),
static_cast<int>(cfg->g_h),
kVideoTrackNumber);
mkvmuxer::VideoTrack* const video_track =
static_cast<mkvmuxer::VideoTrack*>(
segment->GetTrackByNumber(video_track_id));
static_cast<int>(cfg->g_h), kVideoTrackNumber);
mkvmuxer::VideoTrack *const video_track = static_cast<mkvmuxer::VideoTrack *>(
segment->GetTrackByNumber(video_track_id));
video_track->SetStereoMode(stereo_fmt);
const char *codec_id;
switch (fourcc) {
case VP8_FOURCC:
codec_id = "V_VP8";
break;
case VP9_FOURCC:
codec_id = "V_VP9";
break;
case VP10_FOURCC:
codec_id = "V_VP10";
break;
default:
codec_id = "V_VP10";
break;
case VP8_FOURCC: codec_id = "V_VP8"; break;
case VP9_FOURCC: codec_id = "V_VP9"; break;
case VP10_FOURCC: codec_id = "V_VP10"; break;
default: codec_id = "V_VP10"; break;
}
video_track->set_codec_id(codec_id);
if (par->numerator > 1 || par->denominator > 1) {
// TODO(fgalligan): Add support of DisplayUnit, Display Aspect Ratio type
// to WebM format.
const uint64_t display_width =
static_cast<uint64_t>(((cfg->g_w * par->numerator * 1.0) /
par->denominator) + .5);
const uint64_t display_width = static_cast<uint64_t>(
((cfg->g_w * par->numerator * 1.0) / par->denominator) + .5);
video_track->set_display_width(display_width);
video_track->set_display_height(cfg->g_h);
}
@@ -85,25 +73,22 @@ void write_webm_block(struct WebmOutputContext *webm_ctx,
const vpx_codec_enc_cfg_t *cfg,
const vpx_codec_cx_pkt_t *pkt) {
mkvmuxer::Segment *const segment =
reinterpret_cast<mkvmuxer::Segment*>(webm_ctx->segment);
int64_t pts_ns = pkt->data.frame.pts * 1000000000ll *
cfg->g_timebase.num / cfg->g_timebase.den;
if (pts_ns <= webm_ctx->last_pts_ns)
pts_ns = webm_ctx->last_pts_ns + 1000000;
reinterpret_cast<mkvmuxer::Segment *>(webm_ctx->segment);
int64_t pts_ns = pkt->data.frame.pts * 1000000000ll * cfg->g_timebase.num /
cfg->g_timebase.den;
if (pts_ns <= webm_ctx->last_pts_ns) pts_ns = webm_ctx->last_pts_ns + 1000000;
webm_ctx->last_pts_ns = pts_ns;
segment->AddFrame(static_cast<uint8_t*>(pkt->data.frame.buf),
pkt->data.frame.sz,
kVideoTrackNumber,
pts_ns,
segment->AddFrame(static_cast<uint8_t *>(pkt->data.frame.buf),
pkt->data.frame.sz, kVideoTrackNumber, pts_ns,
pkt->data.frame.flags & VPX_FRAME_IS_KEY);
}
void write_webm_file_footer(struct WebmOutputContext *webm_ctx) {
mkvmuxer::MkvWriter *const writer =
reinterpret_cast<mkvmuxer::MkvWriter*>(webm_ctx->writer);
reinterpret_cast<mkvmuxer::MkvWriter *>(webm_ctx->writer);
mkvmuxer::Segment *const segment =
reinterpret_cast<mkvmuxer::Segment*>(webm_ctx->segment);
reinterpret_cast<mkvmuxer::Segment *>(webm_ctx->segment);
segment->Finalize();
delete segment;
delete writer;