diff options
| author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
|---|---|---|
| committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
| commit | a9b7bf3fb3e1334d8defd05ca4cfae870b4912e5 (patch) | |
| tree | 2dab453d94d5e003379a6cc895eceb84c80e23ec /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c | |
| parent | aafd49a91f7c2fa9c7103971c16fa6e1b29e8bfd (diff) | |
astyle formatting cleanup to make the sourcecode more accessible
switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c | 99 |
1 files changed, 53 insertions, 46 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c index e11a54606..5c205ef05 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c @@ -31,63 +31,70 @@ int FFGetChannelMap(struct AVCodecContext * avctx)
{
- switch (avctx->codec_id)
- {
- case CODEC_ID_EAC3 :
- case CODEC_ID_AC3 :
- {
- AC3DecodeContext *s = avctx->priv_data;
+ switch(avctx->codec_id)
+ {
+ case CODEC_ID_EAC3 :
+ case CODEC_ID_AC3 :
+ {
+ AC3DecodeContext *s = avctx->priv_data;
- // Mapping index for s_scmap_ac3
- switch (s->channel_mode)
- {
- case AC3_CHMODE_DUALMONO: return 0;
- case AC3_CHMODE_MONO : return 1;
- case AC3_CHMODE_STEREO : return 2;
- case AC3_CHMODE_3F : return 3;
- case AC3_CHMODE_2F1R : return 4;
- case AC3_CHMODE_3F1R : return 5;
- case AC3_CHMODE_2F2R : return 6;
- case AC3_CHMODE_3F2R : return (s->lfe_on ? 8 : 7);
- }
- }
- break;
- case CODEC_ID_MLP :
- {
- // Mapping index for s_scmap_lpcm
- if (avctx->channels<=8)
- return avctx->channels-1;
- else
- return -1;
- }
- default :
- return 2;
- }
- return -1;
+ // Mapping index for s_scmap_ac3
+ switch(s->channel_mode)
+ {
+ case AC3_CHMODE_DUALMONO:
+ return 0;
+ case AC3_CHMODE_MONO :
+ return 1;
+ case AC3_CHMODE_STEREO :
+ return 2;
+ case AC3_CHMODE_3F :
+ return 3;
+ case AC3_CHMODE_2F1R :
+ return 4;
+ case AC3_CHMODE_3F1R :
+ return 5;
+ case AC3_CHMODE_2F2R :
+ return 6;
+ case AC3_CHMODE_3F2R :
+ return (s->lfe_on ? 8 : 7);
+ }
+ }
+ break;
+ case CODEC_ID_MLP :
+ {
+ // Mapping index for s_scmap_lpcm
+ if(avctx->channels <= 8)
+ return avctx->channels - 1;
+ else
+ return -1;
+ }
+ default :
+ return 2;
+ }
+ return -1;
}
void* FF_aligned_malloc(size_t size, size_t alignment)
{
- return _aligned_malloc(size,alignment);
+ return _aligned_malloc(size, alignment);
}
void FF_aligned_free(void* mem_ptr)
{
- if (mem_ptr)
- _aligned_free(mem_ptr);
+ if(mem_ptr)
+ _aligned_free(mem_ptr);
}
-void* FF_aligned_realloc(void *ptr,size_t size,size_t alignment)
+void* FF_aligned_realloc(void *ptr, size_t size, size_t alignment)
{
- if (!ptr)
- return FF_aligned_malloc(size,alignment);
- else
- if (size==0)
- {
- FF_aligned_free(ptr);
- return NULL;
- }
- else
- return _aligned_realloc(ptr,size,alignment);
+ if(!ptr)
+ return FF_aligned_malloc(size, alignment);
+ else if(size == 0)
+ {
+ FF_aligned_free(ptr);
+ return NULL;
+ }
+ else
+ return _aligned_realloc(ptr, size, alignment);
}
|