virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

g729: Merge g729.h into g729dec.c.

Browse Source 
The header contains just a single define that is only used in g729dec.c.
This commit is contained in:
Diego Biurrun
2011-05-17 15:29:58 +02:00
parent e98a95e779
commit a2077b85da
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/g729.h
View File

@@ -1,29 +0,0 @@
/*
* G.729 decoder
* Copyright (c) 2008 Vladimir Voroshilov
*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_G729_H
#define AVCODEC_G729_H
/**
* subframe size
*/
#define SUBFRAME_SIZE 40
#endif // AVCODEC_G729_H

7
libavcodec/g729dec.c
View File

@@ -30,7 +30,6 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "get_bits.h" #include "get_bits.h"
#include "g729.h"
#include "lsp.h" #include "lsp.h"
#include "celp_math.h" #include "celp_math.h"
#include "acelp_filters.h" #include "acelp_filters.h"
@@ -71,6 +70,12 @@
*/ */
#define SHARP_MAX 13017 #define SHARP_MAX 13017
/**
* subframe size
*/
#define SUBFRAME_SIZE 40
typedef struct { typedef struct {
uint8_t ac_index_bits[2]; ///< adaptive codebook index for second subframe (size in bits) uint8_t ac_index_bits[2]; ///< adaptive codebook index for second subframe (size in bits)
uint8_t parity_bit; ///< parity bit for pitch delay uint8_t parity_bit; ///< parity bit for pitch delay