Update of /cvsroot/audacity/audacity-src/src/export
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5392/src/export
Modified Files:
ExportFFmpegDialogs.cpp ExportFFmpegDialogs.h
Log Message:
Use voodo magic to try to reduce FFmpeg Custom Export Options dialog size.
Index: ExportFFmpegDialogs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpegDialogs.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ExportFFmpegDialogs.cpp 26 May 2009 05:02:59 -0000 1.22
+++ ExportFFmpegDialogs.cpp 31 Dec 2009 09:46:50 -0000 1.23
@@ -915,65 +915,64 @@
S.StartStatic(_("Options"),0);
{
- S.StartMultiColumn(4,wxALIGN_LEFT);
+ S.StartMultiColumn(4, wxALIGN_LEFT);
{
- mLanguageText = S.Id(FELanguageID).TieTextBox(_("Language:"),
wxT("/FileFormats/FFmpegLanguage"), wxEmptyString, 0);
+ mLanguageText = S.Id(FELanguageID).TieTextBox(_("Language:"),
wxT("/FileFormats/FFmpegLanguage"), wxEmptyString, 3);
mLanguageText->SetToolTip(_("ISO 639 3-letter language
code\nOptional\nempty - automatic"));
- mTag = S.Id(FETagID).TieTextBox(_("Tag:"),
wxT("/FileFormats/FFmpegTag"), wxEmptyString, 0);
+ mTag = S.Id(FETagID).TieTextBox(_("Tag:"),
wxT("/FileFormats/FFmpegTag"), wxEmptyString, 4);
mTag->SetToolTip(_("Codec tag (FOURCC)\nOptional\nempty -
automatic"));
- mBitrateSpin = S.Id(FEBitrateID).TieSpinCtrl(_("Bit Rate:"),
wxT("/FileFormats/FFmpegBitRate"), 0,1000000,0);
+ mBitrateSpin = S.Id(FEBitrateID).TieSpinCtrl(_("Bit Rate:"),
wxT("/FileFormats/FFmpegBitRate"), 0, 1000000, 0);
mBitrateSpin->SetToolTip(_("Bit Rate (bits/second) - influences
the resulting file size and quality\nSome codecs may only accept specific
values (128k, 192k, 256k etc)\n0 - automatic\nRecommended - 192000"));
- mQualitySpin = S.Id(FEQualityID).TieSpinCtrl(_("Quality:"),
wxT("/FileFormats/FFmpegQuality"), 0,500,-1);
+ mQualitySpin = S.Id(FEQualityID).TieSpinCtrl(_("Quality:"),
wxT("/FileFormats/FFmpegQuality"), 0, 500, -1);
mQualitySpin->SetToolTip(_("Overall quality, used differently by
different codecs\nRequired for vorbis\n0 - automatic\n-1 - off (use bitrate
instead)"));
- mSampleRateSpin = S.Id(FESampleRateID).TieSpinCtrl(_("Sample
Rate:"), wxT("/FileFormats/FFmpegSampleRate"), 0,200000,0);
+ mSampleRateSpin = S.Id(FESampleRateID).TieSpinCtrl(_("Sample
Rate:"), wxT("/FileFormats/FFmpegSampleRate"), 0, 200000, 0);
mSampleRateSpin->SetToolTip(_("Sample rate (Hz)\n0 - don't change
sample rate"));
- mCutoffSpin = S.Id(FECutoffID).TieSpinCtrl(_("Cutoff Bandwidth:"),
wxT("/FileFormats/FFmpegCutOff"), 0,10000000,0);
+ mCutoffSpin = S.Id(FECutoffID).TieSpinCtrl(_("Cutoff:"),
wxT("/FileFormats/FFmpegCutOff"), 0, 10000000, 0);
mCutoffSpin->SetToolTip(_("Audio cutoff bandwidth
(Hz)\nOptional\n0 - automatic"));
mProfileChoice = S.Id(FEProfileID).TieChoice(_("Profile:"),
wxT("/FileFormats/FFmpegAACProfile"),
mProfileLabels[0], mProfileNames, mProfileLabels);
mProfileChoice->SetToolTip(_("AAC Profile\nLow Complexity
-default\nMost players won't play anything other than LC"));
- S.AddVariableText(_("Use Bit Reservoir"));
+ S.AddVariableText(_("Bit Reservoir"));
S.Id(FEBitReservoirID).TieCheckBox(wxEmptyString,
wxT("/FileFormats/FFmpegBitReservoir"), true);
- S.AddVariableText(_("Use Variable Block Length"));
+ S.AddVariableText(_("VBL"));
S.Id(FEVariableBlockLenID).TieCheckBox(wxEmptyString,
wxT("/FileFormats/FFmpegVariableBlockLen"), true);
-
}
S.EndMultiColumn();
S.StartStatic(_("FLAC options"),0);
{
- S.StartMultiColumn(4);
+ S.StartMultiColumn(4, wxALIGN_LEFT);
{
- mCompressionLevelSpin =
S.Id(FECompLevelID).TieSpinCtrl(_("Compression Level:"),
wxT("/FileFormats/FFmpegCompLevel"), 0,10,-1);
+ mCompressionLevelSpin =
S.Id(FECompLevelID).TieSpinCtrl(_("Compression:"),
wxT("/FileFormats/FFmpegCompLevel"), 0, 10, -1);
mCompressionLevelSpin->SetToolTip(_("Compression
level\nRequired for FLAC\n-1 - automatic\nmin - 0 (fast encoding, large output
file)\nmax - 10 (slow encoding, small output file)"));
- mFrameSizeSpin = S.Id(FEFrameSizeID).TieSpinCtrl(_("Frame
Size:"), wxT("/FileFormats/FFmpegFrameSize"), 0,65535,0);
+ mFrameSizeSpin = S.Id(FEFrameSizeID).TieSpinCtrl(_("Frame:"),
wxT("/FileFormats/FFmpegFrameSize"), 0, 65535, 0);
mFrameSizeSpin->SetToolTip(_("Frame size\nOptional\n0 -
default\nmin - 16\nmax - 65535"));
- mLPCCoeffsPrecisionSpin =
S.Id(FELPCCoeffsID).TieSpinCtrl(_("LPC coefficients precision"),
wxT("/FileFormats/FFmpegLPCCoefPrec"), 0,15,0);
+ mLPCCoeffsPrecisionSpin =
S.Id(FELPCCoeffsID).TieSpinCtrl(_("LPC"),
wxT("/FileFormats/FFmpegLPCCoefPrec"), 0, 15, 0);
mLPCCoeffsPrecisionSpin->SetToolTip(_("LPC coefficients
precision\nOptional\n0 - default\nmin - 1\nmax - 15"));
- mMinPredictionOrderSpin =
S.Id(FEMinPredID).TieSpinCtrl(_("Minimal prediction order"),
wxT("/FileFormats/FFmpegMinPredOrder"), -1,32,-1);
+ mMinPredictionOrderSpin = S.Id(FEMinPredID).TieSpinCtrl(_("Min.
PdO"), wxT("/FileFormats/FFmpegMinPredOrder"), -1, 32, -1);
mMinPredictionOrderSpin->SetToolTip(_("Minimal prediction
order\nOptional\n-1 - default\nmin - 0\nmax - 32 (with LPC) or 4 (without
LPC)"));
- mMaxPredictionOrderSpin =
S.Id(FEMaxPredID).TieSpinCtrl(_("Maximal prediction order"),
wxT("/FileFormats/FFmpegMaxPredOrder"), -1,32,-1);
+ mMaxPredictionOrderSpin = S.Id(FEMaxPredID).TieSpinCtrl(_("Max.
PdO"), wxT("/FileFormats/FFmpegMaxPredOrder"), -1, 32, -1);
mMaxPredictionOrderSpin->SetToolTip(_("Maximal prediction
order\nOptional\n-1 - default\nmin - 0\nmax - 32 (with LPC) or 4 (without
LPC)"));
- mPredictionOrderMethodChoice =
S.Id(FEPredOrderID).TieChoice(_("Prediction Order Method:"),
wxT("/FileFormats/FFmpegPredOrderMethod"),
+ mPredictionOrderMethodChoice =
S.Id(FEPredOrderID).TieChoice(_("PdO Method:"),
wxT("/FileFormats/FFmpegPredOrderMethod"),
mPredictionOrderMethodLabels[4],
mPredictionOrderMethodNames, mPredictionOrderMethodLabels);
mPredictionOrderMethodChoice->SetToolTip(_("Prediction Order
Method\nEstimate - fastest, lower compression\nLog search - slowest, best
compression\nFull search - default"));
- mMinPartitionOrderSpin =
S.Id(FEMinPartOrderID).TieSpinCtrl(_("Minimal partition order"),
wxT("/FileFormats/FFmpegMinPartOrder"), -1,8,-1);
+ mMinPartitionOrderSpin =
S.Id(FEMinPartOrderID).TieSpinCtrl(_("Min. PtO"),
wxT("/FileFormats/FFmpegMinPartOrder"), -1, 8, -1);
mMinPartitionOrderSpin->SetToolTip(_("Minimal partition
order\nOptional\n-1 - default\nmin - 0\nmax - 8"));
- mMaxPartitionOrderSpin =
S.Id(FEMaxPartOrderID).TieSpinCtrl(_("Maximal partition order"),
wxT("/FileFormats/FFmpegMaxPredOrder"), -1,8,-1);
+ mMaxPartitionOrderSpin =
S.Id(FEMaxPartOrderID).TieSpinCtrl(_("Max. PtO"),
wxT("/FileFormats/FFmpegMaxPredOrder"), -1, 8, -1);
mMaxPartitionOrderSpin->SetToolTip(_("Maximal partition
order\nOptional\n-1 - default\nmin - 0\nmax - 8"));
S.AddVariableText(_("Use LPC"));
@@ -985,12 +984,12 @@
S.EndStatic();
S.StartStatic(_("MPEG container options"),0);
{
- S.StartMultiColumn(4);
+ S.StartMultiColumn(4, wxALIGN_LEFT);
{
- mMuxRate = S.Id(FEMuxRateID).TieSpinCtrl(_("Mux Rate:"),
wxT("/FileFormats/FFmpegMuxRate"), 0,10000000,0);
+ mMuxRate = S.Id(FEMuxRateID).TieSpinCtrl(_("Mux Rate:"),
wxT("/FileFormats/FFmpegMuxRate"), 0, 10000000, 0);
mMuxRate->SetToolTip(_("Maximum bit rate of the multiplexed
stream\nOptional\n0 - default"));
- mPacketSize = S.Id(FEPacketSizeID).TieSpinCtrl(_("Packet
Size:"), wxT("/FileFormats/FFmpegPacketSize"), 0,10000000,0);
+ mPacketSize = S.Id(FEPacketSizeID).TieSpinCtrl(_("Packet
Size:"), wxT("/FileFormats/FFmpegPacketSize"), 0, 10000000, 0);
mPacketSize->SetToolTip(_("Packet size\nOptional\n0 -
default"));
}
S.EndMultiColumn();
Index: ExportFFmpegDialogs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpegDialogs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ExportFFmpegDialogs.h 31 Dec 2009 09:16:13 -0000 1.13
+++ ExportFFmpegDialogs.h 31 Dec 2009 09:46:50 -0000 1.14
@@ -375,7 +375,7 @@
static int iAACProfileValues[] = { FF_PROFILE_AAC_LOW, FF_PROFILE_AAC_MAIN,
/*FF_PROFILE_AAC_SSR,*/ FF_PROFILE_AAC_LTP };
/// Names of AAC profiles to be displayed
-static const wxChar *iAACProfileNames[] = { _("Low Complexity"), _("Main
profile"), /*_("SSR"),*/ _("LTP") }; //SSR is not supported
+static const wxChar *iAACProfileNames[] = { _("LC"), _("Main"), /*_("SSR"),*/
_("LTP") }; //SSR is not supported
/// Sample rates supported by AAC encoder (must end with zero-element)
static const int iAACSampleRates[] = { 7350, 8000, 11025, 12000, 16000, 22050,
24000, 32000, 44100, 38000, 64000, 88200, 0 };
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
