Split mpvcore/ into common/, misc/, bstr/

1 files changed, 0 insertions, 178 deletions

diff --git a/mpvcore/av_common.c b/mpvcore/av_common.c
deleted file mode 100644
index 823c825517..0000000000
--- a/mpvcore/av_common.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <assert.h>
-
-#include <libavutil/common.h>
-#include <libavcodec/avcodec.h>
-
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
-#include "demux/packet.h"
-#include "av_common.h"
-#include "codecs.h"
-
-#include "osdep/numcores.h"
-
-
-// Copy the codec-related fields from st into avctx. This does not set the
-// codec itself, only codec related header data provided by libavformat.
-// The goal is to initialize a new decoder with the header data provided by
-// libavformat, and unlike avcodec_copy_context(), allow the user to create
-// a clean AVCodecContext for a manually selected AVCodec.
-// This is strictly for decoding only.
-void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-{
-    if (st->extradata_size) {
-        av_free(avctx->extradata);
-        avctx->extradata_size = 0;
-        avctx->extradata =
-            av_mallocz(st->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-        if (avctx->extradata) {
-            avctx->extradata_size = st->extradata_size;
-            memcpy(avctx->extradata, st->extradata, st->extradata_size);
-        }
-    }
-    avctx->codec_tag                = st->codec_tag;
-    avctx->stream_codec_tag         = st->stream_codec_tag;
-    avctx->bit_rate                 = st->bit_rate;
-    avctx->width                    = st->width;
-    avctx->height                   = st->height;
-    avctx->pix_fmt                  = st->pix_fmt;
-    avctx->sample_aspect_ratio      = st->sample_aspect_ratio;
-    avctx->chroma_sample_location   = st->chroma_sample_location;
-    avctx->sample_rate              = st->sample_rate;
-    avctx->channels                 = st->channels;
-    avctx->block_align              = st->block_align;
-    avctx->channel_layout           = st->channel_layout;
-    avctx->audio_service_type       = st->audio_service_type;
-    avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-}
-
-// We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-union pts { int64_t i; double d; };
-
-// Convert the mpv style timestamp (seconds as double) to a libavcodec style
-// timestamp (integer units in a given timebase).
-//
-// If the given timebase is NULL or invalid, pass through the mpv timestamp by
-// reinterpret casting them to int64_t. In this case, the timestamps will be
-// non-sense for libavcodec, but we expect that it doesn't interpret them,
-// and treats them as opaque.
-int64_t mp_pts_to_av(double mp_pts, AVRational *tb)
-{
-    assert(sizeof(int64_t) >= sizeof(double));
-    if (tb && tb->num > 0 && tb->den > 0)
-        return mp_pts == MP_NOPTS_VALUE ? AV_NOPTS_VALUE : mp_pts / av_q2d(*tb);
-    // The + 0.0 is to squash possible negative zero mp_pts, which would
-    // happen to end up as AV_NOPTS_VALUE.
-    return (union pts){.d = mp_pts + 0.0}.i;
-}
-
-// Inverse of mp_pts_to_av(). (The timebases must be exactly the same.)
-double mp_pts_from_av(int64_t av_pts, AVRational *tb)
-{
-    assert(sizeof(int64_t) >= sizeof(double));
-    if (tb && tb->num > 0 && tb->den > 0)
-        return av_pts == AV_NOPTS_VALUE ? MP_NOPTS_VALUE : av_pts * av_q2d(*tb);
-    // Should libavcodec set the PTS to AV_NOPTS_VALUE, it would end up as
-    // non-sense (usually negative zero) when unwrapped to double.
-    return av_pts == AV_NOPTS_VALUE ? MP_NOPTS_VALUE : (union pts){.i = av_pts}.d;
-}
-
-// Set dst from mpkt. Note that dst is not refcountable.
-// mpkt can be NULL to generate empty packets (used to flush delayed data).
-// Sets pts/dts using mp_pts_to_av(ts, tb). (Be aware of the implications.)
-// Set duration field only if tb is set.
-void mp_set_av_packet(AVPacket *dst, struct demux_packet *mpkt, AVRational *tb)
-{
-    av_init_packet(dst);
-    dst->data = mpkt ? mpkt->buffer : NULL;
-    dst->size = mpkt ? mpkt->len : 0;
-    /* Some codecs (ZeroCodec, some cases of PNG) may want keyframe info
-     * from demuxer. */
-    if (mpkt && mpkt->keyframe)
-        dst->flags |= AV_PKT_FLAG_KEY;
-    if (mpkt && mpkt->avpacket) {
-        dst->side_data = mpkt->avpacket->side_data;
-        dst->side_data_elems = mpkt->avpacket->side_data_elems;
-    }
-    if (mpkt && tb && tb->num > 0 && tb->den > 0)
-        dst->duration = mpkt->duration / av_q2d(*tb);
-    dst->pts = mp_pts_to_av(mpkt ? mpkt->pts : MP_NOPTS_VALUE, tb);
-    dst->dts = mp_pts_to_av(mpkt ? mpkt->dts : MP_NOPTS_VALUE, tb);
-}
-
-void mp_set_avcodec_threads(AVCodecContext *avctx, int threads)
-{
-    if (threads == 0) {
-        threads = default_thread_count();
-        if (threads < 1) {
-            mp_msg(MSGT_GLOBAL, MSGL_WARN, "Could not determine "
-                   "thread count to use, defaulting to 1.\n");
-            threads = 1;
-        }
-        // Apparently some libavcodec versions have or had trouble with more
-        // than 16 threads, and/or print a warning when using > 16.
-        threads = MPMIN(threads, 16);
-    }
-    avctx->thread_count = threads;
-}
-
-void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
-{
-    AVCodec *cur = NULL;
-    for (;;) {
-        cur = av_codec_next(cur);
-        if (!cur)
-            break;
-        if (av_codec_is_decoder(cur) && cur->type == type) {
-            mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id),
-                           cur->name, cur->long_name);
-        }
-    }
-}
-
-int mp_codec_to_av_codec_id(const char *codec)
-{
-    int id = AV_CODEC_ID_NONE;
-    if (codec) {
-        const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec);
-        if (desc)
-            id = desc->id;
-        if (id == AV_CODEC_ID_NONE) {
-            AVCodec *avcodec = avcodec_find_decoder_by_name(codec);
-            if (avcodec)
-                id = avcodec->id;
-        }
-    }
-    return id;
-}
-
-const char *mp_codec_from_av_codec_id(int codec_id)
-{
-    const char *name = NULL;
-    const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id);
-    if (desc)
-        name = desc->name;
-    if (!name) {
-        AVCodec *avcodec = avcodec_find_decoder(codec_id);
-        if (avcodec)
-            name = avcodec->name;
-    }
-    return name;
-}