Commit 6250d36e authored by jehan's avatar jehan

disable MS_SND_CARD_CAP_CAPTURE for aqsound

move vp8 mime type from VP8-DRAFT-0-3-2 to VP8
parent a9c4b3e4
...@@ -188,7 +188,7 @@ endif ...@@ -188,7 +188,7 @@ endif
alldescs.h: Makefile.am $(libmediastreamer_la_SOURCES) alldescs.h: Makefile $(libmediastreamer_la_SOURCES)
builddir=`pwd` && cd $(srcdir) && \ builddir=`pwd` && cd $(srcdir) && \
awk 'BEGIN { FS="[()]" ; }; /^\t*MS_FILTER_DESC_EXPORT/{ printf("%s\n", $$2) } ' > $$builddir/filterdescs.txt $(libmediastreamer_la_SOURCES) && \ awk 'BEGIN { FS="[()]" ; }; /^\t*MS_FILTER_DESC_EXPORT/{ printf("%s\n", $$2) } ' > $$builddir/filterdescs.txt $(libmediastreamer_la_SOURCES) && \
awk 'BEGIN { print("#include \"mediastreamer2/msfilter.h\"\n") } { printf("extern MSFilterDesc %s;\n",$$1) } ' $$builddir/filterdescs.txt > $$builddir/$@ && \ awk 'BEGIN { print("#include \"mediastreamer2/msfilter.h\"\n") } { printf("extern MSFilterDesc %s;\n",$$1) } ' $$builddir/filterdescs.txt > $$builddir/$@ && \
......
...@@ -260,7 +260,7 @@ static void aqcard_detect(MSSndCardManager * m) ...@@ -260,7 +260,7 @@ static void aqcard_detect(MSSndCardManager * m)
memset(&deviceFormat, 0, sizeof(AudioStreamBasicDescription)); memset(&deviceFormat, 0, sizeof(AudioStreamBasicDescription));
MSSndCard *card = aq_card_new("Audio Queue Device", NULL, &deviceFormat, MSSndCard *card = aq_card_new("Audio Queue Device", NULL, &deviceFormat,
&deviceFormat, MS_SND_CARD_CAP_PLAYBACK|MS_SND_CARD_CAP_CAPTURE); &deviceFormat, MS_SND_CARD_CAP_PLAYBACK/*|MS_SND_CARD_CAP_CAPTURE*/);
ms_snd_card_manager_add_card(m, card); ms_snd_card_manager_add_card(m, card);
#else #else
OSStatus err; OSStatus err;
......
...@@ -349,7 +349,7 @@ MSFilterDesc ms_vp8_enc_desc={ ...@@ -349,7 +349,7 @@ MSFilterDesc ms_vp8_enc_desc={
"MSVp8Enc", "MSVp8Enc",
N_("A video VP8 encoder using libvpx library."), N_("A video VP8 encoder using libvpx library."),
MS_FILTER_ENCODER, MS_FILTER_ENCODER,
"VP8-DRAFT-0-3-2", "VP8",
1, /*MS_YUV420P is assumed on this input */ 1, /*MS_YUV420P is assumed on this input */
1, 1,
enc_init, enc_init,
...@@ -365,7 +365,7 @@ MSFilterDesc ms_vp8_enc_desc={ ...@@ -365,7 +365,7 @@ MSFilterDesc ms_vp8_enc_desc={
.name="MSVp8Enc", .name="MSVp8Enc",
.text=N_("A video VP8 encoder using libvpx library."), .text=N_("A video VP8 encoder using libvpx library."),
.category=MS_FILTER_ENCODER, .category=MS_FILTER_ENCODER,
.enc_fmt="VP8-DRAFT-0-3-2", .enc_fmt="VP8",
.ninputs=1, /*MS_YUV420P is assumed on this input */ .ninputs=1, /*MS_YUV420P is assumed on this input */
.noutputs=1, .noutputs=1,
.init=enc_init, .init=enc_init,
...@@ -597,7 +597,7 @@ MSFilterDesc ms_vp8_dec_desc={ ...@@ -597,7 +597,7 @@ MSFilterDesc ms_vp8_dec_desc={
"MSVp8Dec", "MSVp8Dec",
"A VP8 decoder using libvpx library", "A VP8 decoder using libvpx library",
MS_FILTER_DECODER, MS_FILTER_DECODER,
"VP8-DRAFT-0-3-2", "VP8",
1, 1,
1, 1,
dec_init, dec_init,
...@@ -613,7 +613,7 @@ MSFilterDesc ms_vp8_dec_desc={ ...@@ -613,7 +613,7 @@ MSFilterDesc ms_vp8_dec_desc={
.name="MSVp8Dec", .name="MSVp8Dec",
.text="A VP8 decoder using libvpx library", .text="A VP8 decoder using libvpx library",
.category=MS_FILTER_DECODER, .category=MS_FILTER_DECODER,
.enc_fmt="VP8-DRAFT-0-3-2", .enc_fmt="VP8",
.ninputs=1, .ninputs=1,
.noutputs=1, .noutputs=1,
.init=dec_init, .init=dec_init,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment