Move aom source to a sub-directory under media/libaom

There is no damned reason to treat this differently than any other media lib given its license and there never was.

1 files changed, 0 insertions, 96 deletions

diff --git a/third_party/aom/common/webmenc.cc b/third_party/aom/common/webmenc.cc
deleted file mode 100644
index 58ab33670..000000000
--- a/third_party/aom/common/webmenc.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#include "common/webmenc.h"
-
-#include <string>
-
-#include "third_party/libwebm/mkvmuxer/mkvmuxer.h"
-#include "third_party/libwebm/mkvmuxer/mkvmuxerutil.h"
-#include "third_party/libwebm/mkvmuxer/mkvwriter.h"
-
-namespace {
-const uint64_t kDebugTrackUid = 0xDEADBEEF;
-const int kVideoTrackNumber = 1;
-}  // namespace
-
-void write_webm_file_header(struct WebmOutputContext *webm_ctx,
-                            const aom_codec_enc_cfg_t *cfg,
-                            stereo_format_t stereo_fmt, unsigned int fourcc,
-                            const struct AvxRational *par) {
-  mkvmuxer::MkvWriter *const writer = new mkvmuxer::MkvWriter(webm_ctx->stream);
-  mkvmuxer::Segment *const segment = new mkvmuxer::Segment();
-  segment->Init(writer);
-  segment->set_mode(mkvmuxer::Segment::kFile);
-  segment->OutputCues(true);
-
-  mkvmuxer::SegmentInfo *const info = segment->GetSegmentInfo();
-  const uint64_t kTimecodeScale = 1000000;
-  info->set_timecode_scale(kTimecodeScale);
-  std::string version = "aomenc";
-  if (!webm_ctx->debug) {
-    version.append(std::string(" ") + aom_codec_version_str());
-  }
-  info->set_writing_app(version.c_str());
-
-  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));
-  video_track->SetStereoMode(stereo_fmt);
-  const char *codec_id;
-  switch (fourcc) {
-    case AV1_FOURCC: codec_id = "V_AV1"; break;
-    default: codec_id = "V_AV1"; 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);
-    video_track->set_display_width(display_width);
-    video_track->set_display_height(cfg->g_h);
-  }
-  if (webm_ctx->debug) {
-    video_track->set_uid(kDebugTrackUid);
-  }
-  webm_ctx->writer = writer;
-  webm_ctx->segment = segment;
-}
-
-void write_webm_block(struct WebmOutputContext *webm_ctx,
-                      const aom_codec_enc_cfg_t *cfg,
-                      const aom_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;
-  webm_ctx->last_pts_ns = pts_ns;
-
-  segment->AddFrame(static_cast<uint8_t *>(pkt->data.frame.buf),
-                    pkt->data.frame.sz, kVideoTrackNumber, pts_ns,
-                    pkt->data.frame.flags & AOM_FRAME_IS_KEY);
-}
-
-void write_webm_file_footer(struct WebmOutputContext *webm_ctx) {
-  mkvmuxer::MkvWriter *const writer =
-      reinterpret_cast<mkvmuxer::MkvWriter *>(webm_ctx->writer);
-  mkvmuxer::Segment *const segment =
-      reinterpret_cast<mkvmuxer::Segment *>(webm_ctx->segment);
-  segment->Finalize();
-  delete segment;
-  delete writer;
-  webm_ctx->writer = NULL;
-  webm_ctx->segment = NULL;
-}