Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
a5e0c4dd
Commit
a5e0c4dd
authored
13 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
Revert "g729: Merge g729.h into g729dec.c."
This reverts commit
a2077b85
.
parent
0b61af73
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavcodec/g729.h
+29
-0
29 additions, 0 deletions
libavcodec/g729.h
libavcodec/g729dec.c
+1
-6
1 addition, 6 deletions
libavcodec/g729dec.c
with
30 additions
and
6 deletions
libavcodec/g729.h
0 → 100644
+
29
−
0
View file @
a5e0c4dd
/*
* G.729 decoder
* Copyright (c) 2008 Vladimir Voroshilov
*
* 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_G729_H
#define AVCODEC_G729_H
/**
* subframe size
*/
#define SUBFRAME_SIZE 40
#endif // AVCODEC_G729_H
This diff is collapsed.
Click to expand it.
libavcodec/g729dec.c
+
1
−
6
View file @
a5e0c4dd
...
...
@@ -30,6 +30,7 @@
#include
"libavutil/avutil.h"
#include
"get_bits.h"
#include
"g729.h"
#include
"lsp.h"
#include
"celp_math.h"
#include
"acelp_filters.h"
...
...
@@ -70,12 +71,6 @@
*/
#define SHARP_MAX 13017
/**
* subframe size
*/
#define SUBFRAME_SIZE 40
typedef
struct
{
uint8_t
ac_index_bits
[
2
];
///< adaptive codebook index for second subframe (size in bits)
uint8_t
parity_bit
;
///< parity bit for pitch delay
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment