mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3/container_ffmpeg: minor cleanup

Browse Source
This commit is contained in:
martii
2013-03-04 19:22:47 +01:00
parent 2cd0da9170
commit 404c0a2b2d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/container/container_ffmpeg.c
View File

@@ -143,6 +143,9 @@ void releaseMutex(const char *filename, const const char *function, int line) {
static char* Codec2Encoding(enum CodecID id, int* version) static char* Codec2Encoding(enum CodecID id, int* version)
{ {
#ifdef MARTII
fprintf(stderr, "Codec ID: %.8lx\n", (long)id);
#endif
switch (id) switch (id)
{ {
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
@@ -671,12 +674,11 @@ static void FFMPEGThread(Context_t *context) {
if(decoded_data_size <= 0) if(decoded_data_size <= 0)
continue; continue;
int i;
if (is_planar && nc > 1) { if (is_planar && nc > 1) {
int ds = decoded_data_size/sizeof(float)/nc; int ds = decoded_data_size/sizeof(float)/nc;
short *shortSamples = (short *)malloc(nc * ds * sizeof(short)); short *shortSamples = (short *)malloc(nc * ds * sizeof(short));
float *floatSamples = (float *)samples; float *floatSamples = (float *)samples;
int j; int i, j;
for (i = 0; i < ds; i++) for (i = 0; i < ds; i++)
for (j = 0; j < nc; j++) for (j = 0; j < nc; j++)
@@ -689,6 +691,7 @@ static void FFMPEGThread(Context_t *context) {
int ds = decoded_data_size/sizeof(float); int ds = decoded_data_size/sizeof(float);
short *shortSamples = (short *)samples; short *shortSamples = (short *)samples;
float *floatSamples = (float *)samples; float *floatSamples = (float *)samples;
int i;
for (i = 0; i < ds; i++) for (i = 0; i < ds; i++)
shortSamples[2 * i] = shortSamples[2 * i + 1] = floatSamples[i] * 32767.0; shortSamples[2 * i] = shortSamples[2 * i + 1] = floatSamples[i] * 32767.0;
@@ -699,6 +702,7 @@ static void FFMPEGThread(Context_t *context) {
int ds = decoded_data_size/sizeof(float); int ds = decoded_data_size/sizeof(float);
short *shortSamples = (short *)samples; short *shortSamples = (short *)samples;
float *floatSamples = (float *)samples; float *floatSamples = (float *)samples;
int i;
for (i = 0; i < ds; i++) for (i = 0; i < ds; i++)
shortSamples[i] = floatSamples[i] * 32767.0; shortSamples[i] = floatSamples[i] * 32767.0;