1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- mjpegtools-1.8.0/lavtools/lav_io.c 2005-08-27 13:47:20.000000000 +0200
+++ mjpegtools-1.8.0___fixed/lavtools/lav_io.c 2006-05-14 05:45:48.000000000 +0200
@@ -540,15 +540,12 @@
int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
{
- int res;
+ int res = -1;
#ifdef HAVE_LIBQUICKTIME
int i, j;
- int16_t *qt_audio = (int16_t *)buff, **qt_audion;
+ int16_t *buff16 = (int16_t *)buff, **qt_audion;
int channels = lav_audio_channels(lav_file);
-
- qt_audion = malloc(channels * sizeof (int16_t **));
- for (i = 0; i < channels; i++)
- qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);
+ int bits = lav_audio_bits(lav_file);
#endif
video_format = lav_file->format; internal_error = 0; /* for error messages */
@@ -557,24 +554,43 @@
{
case 'a':
case 'A':
- res = AVI_write_audio( lav_file->avi_fd, buff, samps*lav_file->bps);
+ res = AVI_write_audio(lav_file->avi_fd, buff, samps*lav_file->bps);
break;
#ifdef HAVE_LIBQUICKTIME
case 'q':
- /* Deinterleave the audio into the two channels. */
- for (i = 0; i < samps; i++)
- {
- for (j = 0; j < channels; j++)
- qt_audion[j][i] = qt_audio[(channels*i) + j];
- }
- res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL,samps,0);
- for (j = 0; j < channels; j++)
- free(qt_audion[j]);
- free(qt_audion);
- break;
+ if (bits != 16 || channels > 1)
+ {
+ /* Deinterleave the audio into the two channels and/or convert
+ * bits per sample to the required format.
+ */
+ qt_audion = malloc(channels * sizeof(*qt_audion));
+ for (i = 0; i < channels; i++)
+ qt_audion[i] = malloc(samps * sizeof(**qt_audion));
+
+ if (bits == 16)
+ for (i = 0; i < samps; i++)
+ for (j = 0; j < channels; j++)
+ qt_audion[j][i] = buff16[channels * i + j];
+ else
+ if (bits == 8)
+ for (i = 0; i < samps; i++)
+ for (j = 0; j < channels; j++)
+ qt_audion[j][i] = ((int16_t)(buff[channels * i + j]) << 8) ^ 0x8000;
+
+ if (bits == 8 || bits == 16)
+ res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
+
+ for (i = 0; i < channels; i++)
+ free(qt_audion[i]);
+ free(qt_audion);
+ } else {
+ qt_audion = &buff16;
+ res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
+ }
+ break;
#endif
default:
- res = -1;
+ break;
}
return res;
|
GitWeb