virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

lavc/dv.h: move encoder/decoder-specific code to a new header

Browse Source 
dv.h is also used by libavformat, so avoid exposing encoder/decoder code
to it.
This commit is contained in:
Anton Khirnov 2022-08-23 11:54:41 +02:00
parent 828ec6ef43
commit 7203bb6a59
5 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dv.c
View File

@ -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)

34
libavcodec/dv.h
View File

@ -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 */

62
libavcodec/dv_internal.h Normal file
View File

@ -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

1
libavcodec/dvdec.c
View File

@ -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"

1
libavcodec/dvenc.c
View File

@ -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"