RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 

* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
  configure: simplify get_version() function
  build: support asan and tsan toolchain shortcuts
  rmdec: Move SIPR code shared with Matroska demuxer to a separate file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-16 13:19:11 +02:00
parent 36b3b2376d 4c995fafd8
commit 9270a2b374
7 changed files with 112 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2326,6 +2326,16 @@ strip_default="${cross_prefix}${strip_default}"
sysinclude_default="${sysroot}/usr/include"
case "$toolchain" in
clang-asan)
cc_default="clang"
add_cflags -faddress-sanitizer
add_ldflags -faddress-sanitizer
;;
clang-tsan)
cc_default="clang"
add_cflags -fthread-sanitizer
add_ldflags -fthread-sanitizer
;;
msvc)
cc_default="c99wrap cl"
ld_default="c99wrap link"
@ -4254,7 +4264,7 @@ get_version(){
lcname=$1
name=$(toupper $lcname)
file=$source_path/$lcname/version.h
eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak

6
libavformat/Makefile
View File

@ -154,8 +154,8 @@ OBJS-$(CONFIG_LOAS_DEMUXER) += loasdec.o
OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o
OBJS-$(CONFIG_M4V_MUXER) += rawenc.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
isom.o rmdec.o rm.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
isom.o rmsipr.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
isom.o avc.o \
flacenc_header.o avlanguage.o
@ -267,7 +267,7 @@ OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o rawdec.o
OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o
OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o
OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o
OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o rmsipr.o
OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o
OBJS-$(CONFIG_ROQ_DEMUXER) += idroqdec.o
OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o

2
libavformat/matroskadec.c
View File

@ -35,7 +35,7 @@
/* For ff_codec_get_id(). */
#include "riff.h"
#include "isom.h"
#include "rm.h"
#include "rmsipr.h"
#include "matroska.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/mpeg4audio.h"

8
libavformat/rm.h
View File

@ -26,7 +26,6 @@
#include "internal.h"
extern const char * const ff_rm_metadata[4];
extern const unsigned char ff_sipr_subpk_size[4];
extern const AVCodecTag ff_rm_codec_tags[];
typedef struct RMStream RMStream;
@ -93,11 +92,4 @@ int ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
int ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *rst, AVPacket *pkt);
/**
* Perform 4-bit block reordering for SIPR data.
*
* @param buf SIPR data
*/
void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize);
#endif /* AVFORMAT_RM_H */

42
libavformat/rmdec.c
View File

@ -25,6 +25,7 @@
#include "avformat.h"
#include "internal.h"
#include "riff.h"
#include "rmsipr.h"
#include "rm.h"
#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/Atrac
@ -59,21 +60,6 @@ typedef struct {
int audio_pkt_cnt; ///< Output packet counter
} RMDemuxContext;
static const unsigned char sipr_swaps[38][2] = {
{ 0, 63 }, { 1, 22 }, { 2, 44 }, { 3, 90 },
{ 5, 81 }, { 7, 31 }, { 8, 86 }, { 9, 58 },
{ 10, 36 }, { 12, 68 }, { 13, 39 }, { 14, 73 },
{ 15, 53 }, { 16, 69 }, { 17, 57 }, { 19, 88 },
{ 20, 34 }, { 21, 71 }, { 24, 46 }, { 25, 94 },
{ 26, 54 }, { 28, 75 }, { 29, 50 }, { 32, 70 },
{ 33, 92 }, { 35, 74 }, { 38, 85 }, { 40, 56 },
{ 42, 87 }, { 43, 65 }, { 45, 59 }, { 48, 79 },
{ 49, 93 }, { 51, 89 }, { 55, 95 }, { 61, 76 },
{ 67, 83 }, { 77, 80 }
};
const unsigned char ff_sipr_subpk_size[4] = { 29, 19, 37, 20 };
static inline void get_strl(AVIOContext *pb, char *buf, int buf_size, int len)
{
int i;
@ -750,32 +736,6 @@ rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt)
}
}
/**
* Perform 4-bit block reordering for SIPR data.
* @todo This can be optimized, e.g. use memcpy() if data blocks are aligned
*/
void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize)
{
int n, bs = sub_packet_h * framesize * 2 / 96; // nibbles per subpacket
for (n = 0; n < 38; n++) {
int j;
int i = bs * sipr_swaps[n][0];
int o = bs * sipr_swaps[n][1];
/* swap 4bit-nibbles of block 'i' with 'o' */
for (j = 0; j < bs; j++, i++, o++) {
int x = (buf[i >> 1] >> (4 * (i & 1))) & 0xF,
y = (buf[o >> 1] >> (4 * (o & 1))) & 0xF;
buf[o >> 1] = (x << (4 * (o & 1))) |
(buf[o >> 1] & (0xF << (4 * !(o & 1))));
buf[i >> 1] = (y << (4 * (i & 1))) |
(buf[i >> 1] & (0xF << (4 * !(i & 1))));
}
}
}
int
ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *ast, int len, AVPacket *pkt,

61
libavformat/rmsipr.c Normal file
View File

@ -0,0 +1,61 @@
/*
* tables and functions for demuxing SIPR audio muxed RealMedia style
*
* 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
*/
#include <stdint.h>
#include "rmsipr.h"
const unsigned char ff_sipr_subpk_size[4] = { 29, 19, 37, 20 };
static const unsigned char sipr_swaps[38][2] = {
{ 0, 63 }, { 1, 22 }, { 2, 44 }, { 3, 90 },
{ 5, 81 }, { 7, 31 }, { 8, 86 }, { 9, 58 },
{ 10, 36 }, { 12, 68 }, { 13, 39 }, { 14, 73 },
{ 15, 53 }, { 16, 69 }, { 17, 57 }, { 19, 88 },
{ 20, 34 }, { 21, 71 }, { 24, 46 }, { 25, 94 },
{ 26, 54 }, { 28, 75 }, { 29, 50 }, { 32, 70 },
{ 33, 92 }, { 35, 74 }, { 38, 85 }, { 40, 56 },
{ 42, 87 }, { 43, 65 }, { 45, 59 }, { 48, 79 },
{ 49, 93 }, { 51, 89 }, { 55, 95 }, { 61, 76 },
{ 67, 83 }, { 77, 80 }
};
/* This can be optimized, e.g. use memcpy() if data blocks are aligned. */
void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize)
{
int n, bs = sub_packet_h * framesize * 2 / 96; // nibbles per subpacket
for (n = 0; n < 38; n++) {
int j;
int i = bs * sipr_swaps[n][0];
int o = bs * sipr_swaps[n][1];
/* swap 4bit-nibbles of block 'i' with 'o' */
for (j = 0; j < bs; j++, i++, o++) {
int x = (buf[i >> 1] >> (4 * (i & 1))) & 0xF,
y = (buf[o >> 1] >> (4 * (o & 1))) & 0xF;
buf[o >> 1] = (x << (4 * (o & 1))) |
(buf[o >> 1] & (0xF << (4 * !(o & 1))));
buf[i >> 1] = (y << (4 * (i & 1))) |
(buf[i >> 1] & (0xF << (4 * !(i & 1))));
}
}
}

35
libavformat/rmsipr.h Normal file
View File

@ -0,0 +1,35 @@
/*
* tables and functions for demuxing SIPR audio muxed RealMedia style
*
* 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 AVFORMAT_RMSIPR_H
#define AVFORMAT_RMSIPR_H
#include <stdint.h>
extern const unsigned char ff_sipr_subpk_size[4];
/**
* Perform 4-bit block reordering for SIPR data.
*
* @param buf SIPR data
*/
void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize);
#endif /* AVFORMAT_RMSIPR_H */