Mercurial > mplayer.hg
annotate libmpcodecs/ad_acm.c @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | d332ea379205 |
children |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
18 |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
19 #include <stdio.h> |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
20 #include <stdlib.h> |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
21 #include <unistd.h> |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
22 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
23 #include "config.h" |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
24 #include "mp_msg.h" |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
25 #include "help_mp.h" |
30589
df6c41f16b40
Add header for AVI print functions; avoids many forward declarations.
diego
parents:
30504
diff
changeset
|
26 #include "libmpdemux/aviprint.h" |
22577
a033e5519802
Include loader/ prefix in #include path everywhere.
diego
parents:
18771
diff
changeset
|
27 #include "loader/wineacm.h" |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
28 |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
29 #include "ad_internal.h" |
17092 | 30 #include "osdep/timer.h" |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
31 |
30504
cc27da5d7286
Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents:
30421
diff
changeset
|
32 static const ad_info_t info = |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
33 { |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
34 "Win32/ACM decoders", |
5343 | 35 "acm", |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
36 "A'rpi", |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
37 "A'rpi & Alex", |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
38 "" |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
39 }; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
40 |
5343 | 41 LIBAD_EXTERN(acm) |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
42 |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
43 typedef struct { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
44 WAVEFORMATEX *o_wf; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
45 HACMSTREAM handle; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
46 } acm_context_t; |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
47 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
48 static int init(sh_audio_t *sh_audio) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
49 { |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
50 int ret=decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
51 if(ret<0){ |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
52 mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret); |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
53 return 0; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
54 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
55 sh_audio->a_buffer_len=ret; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
56 return 1; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
57 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
58 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
59 static int preinit(sh_audio_t *sh_audio) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
60 { |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
61 HRESULT ret; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
62 WAVEFORMATEX *in_fmt = sh_audio->wf; |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8027
diff
changeset
|
63 DWORD srcsize = 0; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
64 acm_context_t *priv; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
65 |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
66 priv = malloc(sizeof(acm_context_t)); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
67 if (!priv) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
68 return 0; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
69 sh_audio->context = priv; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
70 |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
71 mp_msg(MSGT_WIN32, MSGL_V, "======= Win32 (ACM) AUDIO Codec init =======\n"); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
72 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
73 // priv->handle = NULL; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
74 |
32121 | 75 priv->o_wf = malloc(sizeof(*priv->o_wf)); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
76 if (!priv->o_wf) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
77 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
78 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ACMiniterror); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
79 return 0; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
80 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
81 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
82 priv->o_wf->nChannels = in_fmt->nChannels; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
83 priv->o_wf->nSamplesPerSec = in_fmt->nSamplesPerSec; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
84 priv->o_wf->nAvgBytesPerSec = 2*in_fmt->nSamplesPerSec*in_fmt->nChannels; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
85 priv->o_wf->wFormatTag = WAVE_FORMAT_PCM; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
86 priv->o_wf->nBlockAlign = 2*in_fmt->nChannels; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
87 priv->o_wf->wBitsPerSample = 16; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
88 // priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
89 priv->o_wf->cbSize = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
90 |
17932 | 91 if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
92 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
93 mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n"); |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
94 print_wave_header(in_fmt, MSGL_V); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
95 mp_msg(MSGT_DECAUDIO, MSGL_V, "Output format:\n"); |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
96 print_wave_header(priv->o_wf, MSGL_V); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
97 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
98 |
7390 | 99 MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
100 ret = acmStreamOpen(&priv->handle, (HACMDRIVER)NULL, in_fmt, |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
101 priv->o_wf, NULL, 0, 0, 0); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
102 if (ret) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
103 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
104 if (ret == ACMERR_NOTPOSSIBLE) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
105 mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: Unappropriate audio format\n"); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
106 else |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
107 mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: acmStreamOpen error: %d\n", |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
108 (int)ret); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
109 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ACMiniterror); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
110 return 0; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
111 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
112 mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n"); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
113 |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
114 acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE); |
17932 | 115 //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
116 srcsize *= 2; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
117 //if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
118 if (!srcsize) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
119 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
120 mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n"); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
121 srcsize = 16384; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
122 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
123 // limit srcsize to 4-16kb |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
124 //while(srcsize && srcsize<4096) srcsize*=2; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
125 //while(srcsize>16384) srcsize/=2; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
126 sh_audio->audio_out_minsize=srcsize; // audio output min. size |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
127 mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM output buffer min. size: %ld\n",srcsize); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
128 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
129 acmStreamSize(priv->handle, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
130 // if(srcsize<in_fmt->nBlockAlign) srcsize=in_fmt->nBlockAlign; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
131 |
11683 | 132 if (!srcsize) |
133 { | |
134 mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n"); | |
135 srcsize = 2*in_fmt->nBlockAlign; | |
136 } | |
137 | |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
138 mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM input buffer min. size: %ld\n",srcsize); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
139 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
140 sh_audio->audio_in_minsize=2*srcsize; // audio input min. size |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
141 |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
142 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
143 sh_audio->channels=priv->o_wf->nChannels; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
144 sh_audio->samplerate=priv->o_wf->nSamplesPerSec; |
13427
9d0b052c4f74
setting samplesize to 2 in decoders where neccessary.
reimar
parents:
11683
diff
changeset
|
145 sh_audio->samplesize=2; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
146 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
147 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/ACM audio codec init OK!\n"); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
148 return 1; |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
149 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
150 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
151 static void uninit(sh_audio_t *sh) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
152 { |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
153 HRESULT ret; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
154 acm_context_t *priv = sh->context; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
155 |
23912
de63d6fc46dd
Use goto instead of useless recursion that might fill up the stack
reimar
parents:
23911
diff
changeset
|
156 retry: |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
157 ret = acmStreamClose(priv->handle, 0); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
158 |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
159 if (ret) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
160 switch(ret) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
161 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
162 case ACMERR_BUSY: |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
163 case ACMERR_CANCELED: |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
164 mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: stream busy, waiting..\n"); |
16372
b313a38c69cb
replace sleep with usec_sleep, required for recent mingw versions, patch by Robert Swain <robert.swain at gmail.com>
faust3
parents:
13427
diff
changeset
|
165 usec_sleep(100000000); |
23912
de63d6fc46dd
Use goto instead of useless recursion that might fill up the stack
reimar
parents:
23911
diff
changeset
|
166 goto retry; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
167 case ACMERR_UNPREPARED: |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
168 case ACMERR_NOTPOSSIBLE: |
7471 | 169 return; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
170 default: |
17366 | 171 mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret); |
7471 | 172 return; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
173 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
174 |
7390 | 175 MSACM_UnregisterAllDrivers(); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
176 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
177 free(priv->o_wf); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
178 free(priv); |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
179 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
180 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
181 static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
182 { |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
183 int skip; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
184 switch(cmd) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
185 { |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
186 case ADCTRL_SKIP_FRAME: |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
187 skip=sh_audio->wf->nBlockAlign; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
188 if(skip<16){ |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
189 skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
190 if(skip<16) skip=16; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
191 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
192 demux_read_data(sh_audio->ds,NULL,skip); |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
193 return CONTROL_TRUE; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
194 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
195 return CONTROL_UNKNOWN; |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
196 } |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
197 |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
198 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) |
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
199 { |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
200 ACMSTREAMHEADER ash; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
201 HRESULT hr; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
202 DWORD srcsize=0; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
203 DWORD len=minlen; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
204 acm_context_t *priv = sh_audio->context; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
205 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
206 acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION); |
17366 | 207 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%ld\n",srcsize,sh_audio->a_in_buffer_size,len); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
208 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
209 if(srcsize<sh_audio->wf->nBlockAlign){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
210 srcsize=sh_audio->wf->nBlockAlign; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
211 acmStreamSize(priv->handle, srcsize, &len, ACM_STREAMSIZEF_SOURCE); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
212 if(len>maxlen) len=maxlen; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
213 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
214 |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
215 // if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
216 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
217 if(sh_audio->a_in_buffer_len<srcsize){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
218 sh_audio->a_in_buffer_len+= |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
219 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
220 srcsize-sh_audio->a_in_buffer_len); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
221 } |
17366 | 222 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %ld bytes\n",sh_audio->a_in_buffer_len,len); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
223 memset(&ash, 0, sizeof(ash)); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
224 ash.cbStruct=sizeof(ash); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
225 ash.fdwStatus=0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28051
diff
changeset
|
226 ash.dwUser=0; |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
227 ash.pbSrc=sh_audio->a_in_buffer; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
228 ash.cbSrcLength=sh_audio->a_in_buffer_len; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
229 ash.pbDst=buf; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
230 ash.cbDstLength=len; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
231 hr=acmStreamPrepareHeader(priv->handle,&ash,0); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
232 if(hr){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
233 mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamPrepareHeader error %d\n",(int)hr); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
234 return -1; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
235 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
236 hr=acmStreamConvert(priv->handle,&ash,0); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
237 if(hr){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
238 mp_msg(MSGT_WIN32,MSGL_DBG2,"ACM_Decoder: acmStreamConvert error %d\n",(int)hr); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
239 switch(hr) |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
240 { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
241 case ACMERR_NOTPOSSIBLE: |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
242 case ACMERR_UNPREPARED: |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
243 mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n"); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
244 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
245 // return -1; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
246 } |
17366 | 247 mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %ld -> %ld\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed); |
7228
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
248 if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
249 sh_audio->a_in_buffer_len=0; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
250 } else { |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
251 sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
252 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
253 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
254 len=ash.cbDstLengthUsed; |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
255 hr=acmStreamUnprepareHeader(priv->handle,&ash,0); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
256 if(hr){ |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
257 mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamUnprepareHeader error %d\n",(int)hr); |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
258 } |
0a21be7df603
merged with dll_init.c, moved some variables from sh_audio to private struct
alex
parents:
7191
diff
changeset
|
259 return len; |
5340
0f12fb7c1c5d
imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff
changeset
|
260 } |