Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: silk/enc_API.c

Issue 12388030: Update Opus to 1.0.2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « silk/decode_frame.c ('k') | silk/fixed/LTP_analysis_filter_FIX.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /*********************************************************************** 1 /***********************************************************************
2 Copyright (c) 2006-2011, Skype Limited. All rights reserved. 2 Copyright (c) 2006-2011, Skype Limited. All rights reserved.
3 Redistribution and use in source and binary forms, with or without 3 Redistribution and use in source and binary forms, with or without
4 modification, are permitted provided that the following conditions 4 modification, are permitted provided that the following conditions
5 are met: 5 are met:
6 - Redistributions of source code must retain the above copyright notice, 6 - Redistributions of source code must retain the above copyright notice,
7 this list of conditions and the following disclaimer. 7 this list of conditions and the following disclaimer.
8 - Redistributions in binary form must reproduce the above copyright 8 - Redistributions in binary form must reproduce the above copyright
9 notice, this list of conditions and the following disclaimer in the 9 notice, this list of conditions and the following disclaimer in the
10 documentation and/or other materials provided with the distribution. 10 documentation and/or other materials provided with the distribution.
(...skipping 22 matching lines...) Expand all
33 #include "control.h" 33 #include "control.h"
34 #include "typedef.h" 34 #include "typedef.h"
35 #include "structs.h" 35 #include "structs.h"
36 #include "tuning_parameters.h" 36 #include "tuning_parameters.h"
37 #ifdef FIXED_POINT 37 #ifdef FIXED_POINT
38 #include "main_FIX.h" 38 #include "main_FIX.h"
39 #else 39 #else
40 #include "main_FLP.h" 40 #include "main_FLP.h"
41 #endif 41 #endif
42 42
43 /***************************************/
44 /* Read control structure from encoder */
45 /***************************************/
46 static opus_int silk_QueryEncoder( /* O Returns error co de */
47 const void *encState, /* I State */
48 silk_EncControlStruct *encStatus /* O Encoder Status */
49 );
50
43 /****************************************/ 51 /****************************************/
44 /* Encoder functions */ 52 /* Encoder functions */
45 /****************************************/ 53 /****************************************/
46 54
47 opus_int silk_Get_Encoder_Size( /* O Returns error co de */ 55 opus_int silk_Get_Encoder_Size( /* O Returns error co de */
48 opus_int *encSizeBytes /* O Number of bytes in SILK encoder state */ 56 opus_int *encSizeBytes /* O Number of bytes in SILK encoder state */
49 ) 57 )
50 { 58 {
51 opus_int ret = SILK_NO_ERROR; 59 opus_int ret = SILK_NO_ERROR;
52 60
(...skipping 30 matching lines...) Expand all
83 if( ret += silk_QueryEncoder( encState, encStatus ) ) { 91 if( ret += silk_QueryEncoder( encState, encStatus ) ) {
84 silk_assert( 0 ); 92 silk_assert( 0 );
85 } 93 }
86 94
87 return ret; 95 return ret;
88 } 96 }
89 97
90 /***************************************/ 98 /***************************************/
91 /* Read control structure from encoder */ 99 /* Read control structure from encoder */
92 /***************************************/ 100 /***************************************/
93 opus_int silk_QueryEncoder( /* O Returns error co de */ 101 static opus_int silk_QueryEncoder( /* O Returns error co de */
94 const void *encState, /* I State */ 102 const void *encState, /* I State */
95 silk_EncControlStruct *encStatus /* O Encoder Status */ 103 silk_EncControlStruct *encStatus /* O Encoder Status */
96 ) 104 )
97 { 105 {
98 opus_int ret = SILK_NO_ERROR; 106 opus_int ret = SILK_NO_ERROR;
99 silk_encoder_state_Fxx *state_Fxx; 107 silk_encoder_state_Fxx *state_Fxx;
100 silk_encoder *psEnc = (silk_encoder *)encState; 108 silk_encoder *psEnc = (silk_encoder *)encState;
101 109
102 state_Fxx = psEnc->state_Fxx; 110 state_Fxx = psEnc->state_Fxx;
103 111
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 encControl->complexity = tmp_complexity; 529 encControl->complexity = tmp_complexity;
522 for( n = 0; n < encControl->nChannelsInternal; n++ ) { 530 for( n = 0; n < encControl->nChannelsInternal; n++ ) {
523 psEnc->state_Fxx[ n ].sCmn.controlled_since_last_payload = 0; 531 psEnc->state_Fxx[ n ].sCmn.controlled_since_last_payload = 0;
524 psEnc->state_Fxx[ n ].sCmn.prefillFlag = 0; 532 psEnc->state_Fxx[ n ].sCmn.prefillFlag = 0;
525 } 533 }
526 } 534 }
527 535
528 return ret; 536 return ret;
529 } 537 }
530 538
OLDNEW
« no previous file with comments | « silk/decode_frame.c ('k') | silk/fixed/LTP_analysis_filter_FIX.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698