aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-08-23 11:54:41 +0200
committerAnton Khirnov <anton@khirnov.net>2022-09-05 08:09:00 +0200
commit7203bb6a59c55e853855b2e60e3fbc6d2f65dce1 (patch)
treef6563ebc1ea5955eab212bda5afd95ec3acfc057
parent828ec6ef4306d046749817fd6890e11f3289928b (diff)
downloadffmpeg-7203bb6a59c55e853855b2e60e3fbc6d2f65dce1.tar.gz
lavc/dv.h: move encoder/decoder-specific code to a new header
dv.h is also used by libavformat, so avoid exposing encoder/decoder code to it.
-rw-r--r--libavcodec/dv.c8
-rw-r--r--libavcodec/dv.h34
-rw-r--r--libavcodec/dv_internal.h62
-rw-r--r--libavcodec/dvdec.c1
-rw-r--r--libavcodec/dvenc.c1
5 files changed, 70 insertions, 36 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index b5e54de5dd..eb49978ad8 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -38,8 +38,12 @@
* DV codec.
*/
-#include "avcodec.h"
-#include "dv.h"
+#include <stdint.h>
+
+#include "libavutil/pixfmt.h"
+
+#include "dv_internal.h"
+#include "dv_profile.h"
static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan,
int seq, int slot, uint16_t *tbl)
diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index 859a4e6545..535f01cf0b 100644
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -27,13 +27,6 @@
#ifndef AVCODEC_DV_H
#define AVCODEC_DV_H
-#include "dv_profile.h"
-
-typedef struct DVwork_chunk {
- uint16_t buf_offset;
- uint16_t mb_coordinates[5];
-} DVwork_chunk;
-
enum dv_section_type {
dv_sect_header = 0x1f,
dv_sect_subcode = 0x3f,
@@ -72,31 +65,4 @@ enum dv_pack_type {
*/
#define DV_MAX_BPM 8
-int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d);
-
-static inline int dv_work_pool_size(const AVDVProfile *d)
-{
- int size = d->n_difchan * d->difseg_size * 27;
- if (DV_PROFILE_IS_1080i50(d))
- size -= 3 * 27;
- if (DV_PROFILE_IS_720p50(d))
- size -= 4 * 27;
- return size;
-}
-
-static inline void dv_calculate_mb_xy(const AVDVProfile *sys,
- const uint8_t *buf,
- const DVwork_chunk *work_chunk,
- int m, int *mb_x, int *mb_y)
-{
- *mb_x = work_chunk->mb_coordinates[m] & 0xff;
- *mb_y = work_chunk->mb_coordinates[m] >> 8;
-
- /* We work with 720p frames split in half.
- * The odd half-frame (chan == 2,3) is displaced :-( */
- if (sys->height == 720 && !(buf[1] & 0x0C))
- /* shifting the Y coordinate down by 72/2 macro blocks */
- *mb_y -= (*mb_y > 17) ? 18 : -72;
-}
-
#endif /* AVCODEC_DV_H */
diff --git a/libavcodec/dv_internal.h b/libavcodec/dv_internal.h
new file mode 100644
index 0000000000..4b4151c88d
--- /dev/null
+++ b/libavcodec/dv_internal.h
@@ -0,0 +1,62 @@
+/*
+ * DV encoder/decoder shared code
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DV_INTERNAL_H
+#define AVCODEC_DV_INTERNAL_H
+
+#include <stdint.h>
+
+#include "dv.h"
+#include "dv_profile.h"
+
+typedef struct DVwork_chunk {
+ uint16_t buf_offset;
+ uint16_t mb_coordinates[5];
+} DVwork_chunk;
+
+int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d);
+
+static inline int dv_work_pool_size(const AVDVProfile *d)
+{
+ int size = d->n_difchan * d->difseg_size * 27;
+ if (DV_PROFILE_IS_1080i50(d))
+ size -= 3 * 27;
+ if (DV_PROFILE_IS_720p50(d))
+ size -= 4 * 27;
+ return size;
+}
+
+static inline void dv_calculate_mb_xy(const AVDVProfile *sys,
+ const uint8_t *buf,
+ const DVwork_chunk *work_chunk,
+ int m, int *mb_x, int *mb_y)
+{
+ *mb_x = work_chunk->mb_coordinates[m] & 0xff;
+ *mb_y = work_chunk->mb_coordinates[m] >> 8;
+
+ /* We work with 720p frames split in half.
+ * The odd half-frame (chan == 2,3) is displaced :-( */
+ if (sys->height == 720 && !(buf[1] & 0x0C))
+ /* shifting the Y coordinate down by 72/2 macro blocks */
+ *mb_y -= (*mb_y > 17) ? 18 : -72;
+}
+
+#endif // AVCODEC_DV_INTERNAL_H
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 2622a7e0c5..994c53534e 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -44,6 +44,7 @@
#include "codec_internal.h"
#include "decode.h"
#include "dv.h"
+#include "dv_internal.h"
#include "dv_profile_internal.h"
#include "dvdata.h"
#include "get_bits.h"
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index a4d18ec0ef..c2f13e2d39 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -38,6 +38,7 @@
#include "avcodec.h"
#include "codec_internal.h"
#include "dv.h"
+#include "dv_internal.h"
#include "dv_profile_internal.h"
#include "dv_tablegen.h"
#include "encode.h"