Commit 9586a683 authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwindows/streamout.cpp: removed avi muxer + added wav muxer and a few more codecs.

parent f813caa8
...@@ -65,7 +65,7 @@ enum ...@@ -65,7 +65,7 @@ enum
EncapsulationRadio3_Event, EncapsulationRadio4_Event, EncapsulationRadio3_Event, EncapsulationRadio4_Event,
EncapsulationRadio5_Event, EncapsulationRadio6_Event, EncapsulationRadio5_Event, EncapsulationRadio6_Event,
EncapsulationRadio7_Event, EncapsulationRadio8_Event, EncapsulationRadio7_Event, EncapsulationRadio8_Event,
EncapsulationRadio9_Event, EncapsulationRadio9_Event, EncapsulationRadio10_Event,
VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event, VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event,
VideoTranscScale_Event, VideoTranscScale_Event,
...@@ -297,6 +297,9 @@ void SoutDialog::UpdateMRL() ...@@ -297,6 +297,9 @@ void SoutDialog::UpdateMRL()
case ASF_ENCAPSULATION: case ASF_ENCAPSULATION:
encapsulation = wxT("asf"); encapsulation = wxT("asf");
break; break;
case WAV_ENCAPSULATION:
encapsulation = wxT("wav");
break;
case TS_ENCAPSULATION: case TS_ENCAPSULATION:
default: default:
encapsulation = wxT("ts"); encapsulation = wxT("ts");
...@@ -588,15 +591,15 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent ) ...@@ -588,15 +591,15 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
wxT("MPEG PS"), wxT("MPEG PS"),
wxT("MPEG 1"), wxT("MPEG 1"),
wxT("Ogg"), wxT("Ogg"),
wxT("Raw"),
wxT("ASF"), wxT("ASF"),
wxT("AVI"),
wxT("MP4"), wxT("MP4"),
wxT("MOV") wxT("MOV"),
wxT("WAV"),
wxT("Raw")
}; };
/* Stuff everything into the main panel */ /* Stuff everything into the main panel */
for( i=0; i < ENCAPS_NUM; i++ ) for( i = 0; i < WXSIZEOF(encapsulation_array); i++ )
{ {
encapsulation_radios[i] = encapsulation_radios[i] =
new wxRadioButton( panel, EncapsulationRadio1_Event + i, new wxRadioButton( panel, EncapsulationRadio1_Event + i,
...@@ -605,6 +608,13 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent ) ...@@ -605,6 +608,13 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL |
wxALL, 4 ); wxALL, 4 );
} }
/* Hide avi one */
for( i = WXSIZEOF(encapsulation_array); i < ENCAPS_NUM; i++ )
{
encapsulation_radios[i] =
new wxRadioButton( panel, EncapsulationRadio1_Event + i, wxT("") );
encapsulation_radios[i]->Hide();
}
panel->SetSizerAndFit( panel_sizer ); panel->SetSizerAndFit( panel_sizer );
...@@ -710,12 +720,15 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent ) ...@@ -710,12 +720,15 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent )
static const wxString wxacodecs_array[] = static const wxString wxacodecs_array[] =
{ {
wxT("mpga"), wxT("mpga"),
wxT("mp2a"),
wxT("mp3"), wxT("mp3"),
wxT("mp4a"), wxT("mp4a"),
wxT("a52"), wxT("a52"),
wxT("vorb"), wxT("vorb"),
wxT("flac"), wxT("flac"),
wxT("spx") wxT("spx"),
wxT("s16l"),
wxT("fl32")
}; };
static const wxString achannels_array[] = static const wxString achannels_array[] =
{ {
......
...@@ -518,11 +518,12 @@ enum ...@@ -518,11 +518,12 @@ enum
PS_ENCAPSULATION, PS_ENCAPSULATION,
MPEG1_ENCAPSULATION, MPEG1_ENCAPSULATION,
OGG_ENCAPSULATION, OGG_ENCAPSULATION,
RAW_ENCAPSULATION,
ASF_ENCAPSULATION, ASF_ENCAPSULATION,
AVI_ENCAPSULATION,
MP4_ENCAPSULATION, MP4_ENCAPSULATION,
MOV_ENCAPSULATION, MOV_ENCAPSULATION,
WAV_ENCAPSULATION,
RAW_ENCAPSULATION,
AVI_ENCAPSULATION,
ENCAPS_NUM ENCAPS_NUM
}; };
......
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