dynaflash [Thu, 22 Feb 2007 06:53:23 +0000 (06:53 +0000)]
MacGui: User Presets
- Replaced horrible drawer toggle button on main window with less horrible one
- Removed current preset info field on main window until it works right
- Cleaned up a bit of preset code (still more to do) in Controller.mm
dynaflash [Wed, 21 Feb 2007 22:40:28 +0000 (22:40 +0000)]
MacGui: Initial User Presets Implementation
- Presets displayed in drawer in main window
- Presets stored in ~Libraries/Application Support/MediaFork/userpresets.plist
- Preference to show/hide presets drawer upon launch
- Confirmation window comes up when you delete a preset
Also added creation of x264profiles.plist in anticipation of x264 custom profiles
ToDo- Upcoming changes/additons:
- Alphabetize Presets List
- Change ugly button on main window to toggle drawer
- Specify a preset as default to set upon launch
- Deselect preset after it has been clicked
- Incorporate Picture settings into preset
- Pref on whether or not to alert upon Preset deletion
- Some more I can think of right now!
maurj [Fri, 16 Feb 2007 17:29:27 +0000 (17:29 +0000)]
Created a small droplet application, "MP4toMOV.app" (Mac OS X only for now) to convert a MediaFork mp4 file into a .mov file which can be read by iTunes and FrontRow. You only really need to do this if you are using 6-channel AAC in your mp4 files, as iTunes and FrontRow can already read stereo mp4 files.
To use MP4toMOV, drag one or more mp4 files onto the application's icon. MP4toMOV will convert the files to QuickTime .mov format. New files will be created in the same directory as the .mp4 files, with the .mov extension added to the end. These .mov files can then be dragged to iTunes for use in iTunes and FrontRow, even if they have 6-channel AAC soundtracks. MP4toMOV will quit once all files have been converted.
Alternatively, double-click on MP4toMOV, and select "File > Open" to open a single file for conversion.
MP4toMOV is created with REALbasic, and the MP4toMOV.rbp file is a project file for REALbasic 2007r1. REALbasic is available from http://www.realbasic.com/ .
prigaux [Fri, 16 Feb 2007 08:06:22 +0000 (08:06 +0000)]
Makefile modifications, the MF_BUILD and MF_VERSION are taken from Makefile.config.
the Info.plist is generated from the localize.sh script in macosx folder. Xcode settings are set at build time, no need the play around.
If modifications are needed in Info.plist, you must correct the localize script to show the right output.
The info.plist informations are seen in aboutbox of Mac GUI.
maurj [Thu, 15 Feb 2007 18:06:22 +0000 (18:06 +0000)]
Patched mp4v2 in mpeg4ip to make the "matrix" property of the tkhd atom in an mp4 container not be protected. (it's stored in the "reserved3" property of the tkhd atom).
Added some new code to muxmp4.c to check for a job->pixel_ratio, and set the tkhd matrix to scale the width up by the right amount where one exists. This means that QuickTime now honours our anamorphic scaling!
Updated a small error in deca52.c which wasn't critical, but was causing an error when compiling
maurj [Tue, 13 Feb 2007 21:36:38 +0000 (21:36 +0000)]
Some small amendments to the 6-channel AAC GUI code:
- selecting a non-exportable setting (a non-5.1 track, or a non-AAC codec) now unchecks fAudLang1SurroundCheck as well as disabling it
- selecting the iPod video setting "MP4 file, AVC/H.264 Video, x264 (h.264 iPod)" will uncheck fAudLang1SurroundCheck, in a similar way to the way it turns off anamorphic
- fixed a small bug in the code that checks for when the iPod video setting is selected, to ensure it checks all three popups (previously the codecs popup wasn't being checked, meaning that selecting "MP4 file, MPEG-3 Video, XviD" would also turn off anamorphic)
maurj [Tue, 13 Feb 2007 20:40:03 +0000 (20:40 +0000)]
Updates to Mac OS X GUI to support 5.1 audio extraction as AAC, based on dynaflash's addition of a checkbox to the audio tab
- this includes a new function in controller.mm - Check6ChannelAACExtraction - to set the visibility of the checkbox (fAudLang1SurroundCheck) based on the current audio settings. This is called by several of the popup menus whenever they change
- note - this still doesn't take into account the second audio track, which is still broken (and disabled) as before
maurj [Tue, 13 Feb 2007 14:45:03 +0000 (14:45 +0000)]
Minor amendments to 5.1 audio support:
* ensuring that non-AAC audio formats always use a stereo mix (rather than mono)
* ensuring that Dolby Surround (Pro Logic) source is passed through as Dolby Surround (Pro Logic), and not mixed down to Stereo
* storing the ac3 flags with the job for later reference
Note: this is still using the settings for the last selected soundtrack for *all* soundtracks. This needs improving, as they may not be of the same format!
Tested with mono, stereo, pro logic and 5.1 AC3 sources, to all output audio formats, with success all round :)
maurj [Mon, 12 Feb 2007 23:46:01 +0000 (23:46 +0000)]
First 5.1 support for MediaForkCLI. Uses a new command line option of "-6 --surround" to preserve 5.1 audio as a 6-channel AAC track when using FAAC for audio. For example: ./MediaForkCLI -i /dev/disk5 -o penguins_test.mp4 -t 1 -c 1 -6 -e ffmpeg -E faac -d -R 44.1
For now, this assumes that all selected audio tracks have the same audio format. Since only one audio track works at present, this isn't a disaster.
johnallen [Sun, 14 Jan 2007 02:03:37 +0000 (02:03 +0000)]
added call to av_log_set_level in hb_init_real based on value of verbose param.
makes ffmpeg debbuging level the same as ours.
will be useful while finding the memory leak issue.
johnallen [Sun, 14 Jan 2007 01:26:22 +0000 (01:26 +0000)]
barber pole progress bar is shown during the "muxing" phase and no longer show 0.0%. applies to both HB and IHB
When we can figure out how to get a percent complete, we can use that.
IHB now uses same app icon as HB. Probably want to change the actual icon, but I wanted IHB to make use of the dock progress bar like in HB.
benlake [Wed, 10 Jan 2007 11:25:18 +0000 (11:25 +0000)]
- OSX GUI: the [Enable Queue] checkbox was not disabled by default. A user could click Cancel on the Open DVD menu, enable the queue, click Add to Queue and crash HandBrake. Also, it annoyed me being the only thing enabled :)
dynaflash [Mon, 8 Jan 2007 17:06:39 +0000 (17:06 +0000)]
Revert HB mac gui to m0k layout for impending 0.7.2 release.
Note: pri's language default combobox is also gone in this reversion for the preferences window. However, the underlying code for it is still retained in controller.mm.
johnallen [Mon, 8 Jan 2007 03:18:40 +0000 (03:18 +0000)]
added worker thread sleep throttling.
each of the work object threads now self adjust their sleep interval based on the "fullness" of their fifo.
80% is the choose threshold.
Work objects with a fifo fullness of greater than 80% increase their sleep interval.
This allows other work object with less than 80% fullness more CPU usage.
Also adjusted thread_func, reader, and muxer sleep intervals to more reasonable values.
johnallen [Sun, 7 Jan 2007 15:34:07 +0000 (15:34 +0000)]
added HB_STATE_MUXING to hb_state_s and corresponding structure.
this state indicates the transition from the end of HB_STATE_WORKING to the beginning of HB_STATE_WORKDONE.
This state can take as long a 10 minutes on a long conversion.
The associated working structure contains a progress float.
Once we determine how to get a proper progress from the call to av_write_trailer in libavformat, we can update this progress.
HB, IHB, and HBTest are now using using HB_STATE_MUXING to provided feedback to the user.
projects / handbrake / log