eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-18 13:49:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix allocation for qt files

Browse Source
This commit is contained in:
c0ntrol
2018-09-15 21:03:12 +02:00
parent 1896983715
commit 56c5f8b7b2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
veejay-current/veejay-server/libel/lav_io.c
View File

@@ -425,12 +425,9 @@ int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
int16_t *qt_audio = (int16_t *)buff, **qt_audion; int16_t *qt_audio = (int16_t *)buff, **qt_audion;
int channels = lav_audio_channels(lav_file); int channels = lav_audio_channels(lav_file);
int bits = lav_audio_bits(lav_file); int bits = lav_audio_bits(lav_file);
#ifdef HAVE_LIBQUICKTIME
int res=0; int res=0;
#endif
qt_audion = malloc(channels * sizeof (int16_t **));
for (i = 0; i < channels; i++) for (i = 0; i < channels; i++)
qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps); qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps * sizeof(int16_t));
#endif #endif
switch(lav_file->format ) switch(lav_file->format )
{ {
@@ -439,6 +436,7 @@ int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
case 'Q': case 'Q':
if (bits != 16 || channels > 1) if (bits != 16 || channels > 1)
{ {
qt_audion = (int16_t**) malloc(channels * sizeof (int16_t*));
/* Deinterleave the audio into the two channels and/or convert /* Deinterleave the audio into the two channels and/or convert
* bits per sample to the required format. * bits per sample to the required format.
*/ */
@@ -895,9 +893,9 @@ int lav_read_audio(lav_file_t *lav_file, uint8_t *audbuf, long samps)
int16_t *qt_audio = (int16_t *)audbuf, **qt_audion; int16_t *qt_audio = (int16_t *)audbuf, **qt_audion;
int channels = lav_audio_channels(lav_file); int channels = lav_audio_channels(lav_file);
uint8_t b0, b1; uint8_t b0, b1;
qt_audion = malloc(channels * sizeof (int16_t **)); qt_audion = (int16_t**) malloc(channels * sizeof (int16_t*));
for (i = 0; i < channels; i++) for (i = 0; i < channels; i++)
qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps); qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps * sizeof(int16_t));
start_pos = quicktime_audio_position(lav_file->qt_fd, 0); start_pos = quicktime_audio_position(lav_file->qt_fd, 0);
lqt_decode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0); lqt_decode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);