Read about our upcoming Code of Conduct on this issue

Commit 45c29921 authored by a1ex's avatar a1ex
Browse files

Doc update

--HG--
branch : 550d
parent 0cfb7364e64a
......@@ -7,7 +7,7 @@ Features
* Audio: `disable AGC`_ and digital filters, `audio meters`_, `manual audio controls`_, selectable `input source`_ (internal, internal+external, external stereo, `balanced`_), `audio monitoring`_ via USB.
* Exposure helpers: `zebras`_, `false color`_, `histogram`_, `waveform`_, `spotmeter`_.
* Focus tools: `focus peaking`_, `zoom while recording`_, `trap focus`_, `rack focus`_, `follow focus`_, `focus stacking`_, `focus graph`_, `zoom in Face Detect mode`_.
* Movie helpers: `Bitrate control`_ (QScale or CBR), `custom AF algorithm`_, `movie logging`_ (Exif-like metadata), `auto-restart`_ after buffer overflow or 4 GB limit, `time remaining display`_, `clean LiveView display`_ without any overlays, `change movie position`_ on the mode dial.
* Movie helpers: `Bitrate control`_ (QScale or CBR), `movie logging`_ (Exif-like metadata), `auto-restart`_ after buffer overflow or 4 GB limit, `time remaining display`_, `clean LiveView display`_ without any overlays, `change movie position`_ on the mode dial.
* `Cropmark`_ images: user-editable overlays to assist framing and composition.
* Fine control for `ISO`_, `Shutter`_, `Kelvin white balance`_ and other `image settings`_.
* Remote release with `LCD face sensor`_ and `audio trigger`_, without extra hardware.
......@@ -15,7 +15,7 @@ Features
* Timelapse: `intervalometer`_ (for photos and movies), `silent pictures`_ without shutter actuation; integration with bracketing.
* Astro- and night photography: `bulb timer`_ for very long exposures (up to 8h).
* Info displays: `focus and DOF info`_, `CMOS temperature`_, `shutter count`_, `clock`_.
* For strobists: `flash exposure compensation`_ from -10 to +3 EV; auto-toggle `flash / no flash`_ (even pics without flash, odd pics with flash).
* For strobists: `flash exposure compensation`_ from -10 to +3 EV.
* Power management: `Turn off display`_ in LiveView mode; quickly adjust `LCD backlight level`_.
* Fun stuff: `slit-scan pictures`_.
......@@ -174,19 +174,6 @@ Flash button shortcuts
* Flash + ``UP / DOWN`` in Movie mode: adjust `audio`_ gain (volume for recording).
* Flash + ``LEFT / RIGHT`` in Movie mode: adjust `ISO`_.
``Q`` button shortcuts
~~~~~~~~~~~~~~~~~~~~~~
* ``Q`` followed by ``SET``, while *ISO speed* dialog is active: go to `ISO`_ item in ML menu.
* ``Q`` while *White balance* dialog is active: go to `WhiteBalance`_ item in ML menu.
* ``Q`` while *Picture Style* dialog is active: go to `Contrast`_ item in ML menu.
* ``Q`` while *AF mode* dialog is active: go to `Trap Focus`_ item in ML menu.
* ``Q`` while *Drive mode* dialog is active: go to `LCD Remote Shot`_ item in ML menu.
* ``Q`` while *Flash exposure comp.* dialog is active: go to `Flash AEcomp`_ item in ML menu.
* ``Q`` while *Quality* dialog (picture quality) is active: go to `Auto Burst PicQ`_ item in ML menu.
* ``Q`` while LiveView zoom is active: go to `Magic Zoom`_ item in ML menu.
* ``Q`` in Play mode: draw the following items from `LiveV`_ menu: zebra, false color, histogram, waveform, spotmeter and cropmarks.
Misc shortcuts
~~~~~~~~~~~~~~
......@@ -194,15 +181,18 @@ Misc shortcuts
* ``ISO`` followed by ``LV``: switch to Movie mode (from photo mode).
* ``ISO`` followed by ``DISP``: change current `display preset`_.
* ``Zoom In`` while recording: it does just that :) (`Magic Zoom`_)
* Half-shutter / ``*``: see `Display`_, `Trap Focus`_, `Silent Picture`_, `Movie AF`_, `Bulb timer`_, `Movie REC key`_.
* Half-shutter / ``*``: see `Display`_, `Trap Focus`_, `Silent Picture`_, `Bulb timer`_, `Movie REC key`_.
* ``MENU`` while recording will clear the screen and force a redraw of ML elements.
* ``SET`` in LiveView: center AF area (the little rectangle).
* ``MENU`` -> ``DISP``: display extra info like `shutter count`_ and `CMOS temperature`_.
* ``Q`` followed by ``SET``, while *ISO speed* dialog is active: go to `ISO`_ item in ML menu.
* ``Q`` in Play mode: draw the following items from `LiveV`_ menu: zebra, false color, histogram, waveform, spotmeter and cropmarks.
* ``LV`` button in ``PLAY`` or ``QuickReview`` mode: create a transparent overlay from current image. You can then move the overlay around with arrow keys in LiveView mode. To deactivate the overlay, go to ``PLAY`` mode and back without pressing ``LV`` on a new image.
Menu options
------------
Press ERASE button to show the menu. Use arrows to navigate, ``SET`` to change values forwards
Press ``ERASE`` button to show the menu. Use arrows to navigate, ``SET`` to change values forwards
and ``DISP`` to change values backwards. Some options may also use the ``Q`` button, or may have a different meaning for ``DISP``.
For one-handed navigation in ML menu, ``PLAY`` is the same as ``DISP``.
......@@ -221,9 +211,11 @@ Audio tweaks.
.. _audio meters:
**Audio Meters: ON / OFF / MovieOnly**
**Audio Meters: ON / OFF**
Draw the audio meters or not. The ``Movie Only`` settings enables audio meters in movie mode only (default).
Draw the audio meters or not. This setting takes effect only in movie mode.
Audio level scale is from -40dB to 0dB.
.. _manual audio controls:
......@@ -243,15 +235,15 @@ Audio tweaks.
.. _input source:
**Input**
**Input source**
Audio input source for recording:
* **internal mic**
* **int Left ext Right**
* **L:int R:ext**
* **external stereo**
* **int Left ext Balanced** (internal Left + Right from both external pins as balanced audio)
* **Auto int/ext**: camera detects if a mic is plugged in. Int is dual mono, ext is stereo. Does not work with AudioMon builds.
* **L:int R:balanced** (internal mic on Left, external mic on Right from both external pins as balanced audio)
* **Auto int/ext**: camera detects if a mic is plugged in. Int is dual mono, ext is stereo.
.. _balanced:
......@@ -264,6 +256,15 @@ Audio tweaks.
{{clr}}
**Phantom Power: ON/OFF**
This is required for internal mic and certain types of external mics, but it reduces input impedance. See `AK4646 datasheet p.31 <http://www.vimeo.com/groups/magiclantern/view_file:9434>`_ and the `Mic power control <http://groups.google.com/group/ml-devel/browse_thread/thread/516d22e75dcb9357>`_ thread, and maybe `Phantom Power article on Wikipedia <http://en.wikipedia.org/wiki/Phantom_power>`_.
* ``ON``: input impedance is 2 kOhm
* ``OFF``: input impedance is 30 kOhm
This setting is always ``ON`` when input source is either ``internal mic`` or ``L:int R:ext``.
.. _audio monitoring:
**Monitoring-USB: ON/OFF**
......@@ -375,12 +376,6 @@ LiveView overlays: histogram, zebras, cropmarks, spotmeter, focus peaking, false
{{clr}}
**Ghost image: OFF / Centered / Left / Right**
Shows a transparent overlay which can be created from any image in Play mode.
To select the image, go to Play mode and press ``Q`` followed by ``SET``.
.. _spotmeter:
**Spotmeter: OFF / Percent / IRE**
......@@ -452,7 +447,7 @@ LiveView overlays: histogram, zebras, cropmarks, spotmeter, focus peaking, false
* ``OFF``
* ``Zrec``: triggered by ``Zoom In`` button, pressed either while recording or while the LCD sensor is covered
* ``Zr+F``: triggered by ``Zoom In`` button while recording, and also by rotating the focus ring (only on lenses which report focus distance, or if you use `follow focus`_ / `movie AF`_ / `rack focus`_).
* ``Zr+F``: triggered by ``Zoom In`` button while recording, and also by rotating the focus ring (only on lenses which report focus distance, or if you use `follow focus`_ / `rack focus`_).
* ``(*)``: triggered by ``Zoom In`` button (overrides Canon's default zoom modes). To bypass magic zoom, cover the LCD sensor or press both zoom buttons at the same time.
Size / magnification (change with ``DISP`` or ``PLAY``):
......@@ -505,7 +500,7 @@ Functions specific to movie mode.
Modes:
* ``FW default``: default bitrate used by Canon firmware (CBR, around 45mbps in 1080p, including sound).
* ``CBR``: constant bitrate. You specify a factor for multiplying default video bitrate, between 0.3x and 3x. CBR 1x is equivalent to FW default. The implementation uses variable QScale, displayed near the recording dot.
* ``CBR``: constant bitrate. You specify a factor for multiplying default video bitrate, between 0.1x and 3x. CBR 1x is equivalent to FW default. The implementation uses variable QScale, displayed near the recording dot.
* ``QScale``: constant quality, variable bitrate (VBR). Available values: -16 ... +16. Lower numbers mean higher bitrates.
Keys:
......@@ -733,22 +728,18 @@ Functions for stills shooting (some of them work for movies, too).
Be careful: this may trigger the shutter from the sounds made by camera (like focus beep or liveview switch).
**Motion Detect: ON/OFF**
Experimental motion detection. Right now it only reacts to brightness change in the middle of the LiveView image.
.. _flash / no flash:
**Motion Detect: OFF / EXP / DIF**
**Flash / No flash: ON/OFF**
This will toggle flash setting (on/off) after each photo:
Experimental motion detection.
* Even pictures (by file number) will be taken without flash
* Odd pictures will be taken with flash
* ``EXP``: it only reacts to brightness (EXPosure) change in the middle of the LiveView image. Useful for large moving subjects which cause significant change in exposure.
* ``DIF``: it computes the DIFference between last two frames A and B (luma channel only); it is useful for smaller movements which do not change exposure. Trigger condition is:
This function works only in P,A,S,M modes. The effect is somewhat similar to Fuji's Natural Light with Flash mode.
.. raw:: latex
Don't forget to pop up the flash :)
$$ \sum_{i,j}{ |A_{ij} - B_{ij}| } > level $$
Detection time is somewhere between 200 and 300 ms according to `DataGhost's speed test <http://dataghost.com/chdk/md_meter.html>`_; it's faster with silent pictures.
.. _silent pictures:
.. _Silent Picture:
......@@ -763,7 +754,6 @@ Functions for stills shooting (some of them work for movies, too).
Modes:
* ``Silent Picture``: simple, low-resolution. Image resolution is usually around 1 or 2 MPix, and depends on the current mode (zoom or not, recording or not, and movie resolution). For almost-FullHD resolution (1720x974), choose ``FullHD`` to record a dummy movie. `Details here <http://magiclantern.wikia.com/wiki/VRAM/550D#0x44000080>`_.
* ``Silent Pic Hi-Res``: emulates high-resolution by taking a matrix of small silent pics, in zoom ``x5`` mode. You need to have the camera on a tripod and the scene should be almost stationary (a pic is taken in a few seconds). Useful for timelapse. Only works well with manual focus.
* ``Slit-scan Pic``: this takes distorted images `like these <http://people.rit.edu/andpph/text-slit-scan.html>`_. This mode is basically an extreme jello effect which can be used in creative ways.
Keys:
......@@ -772,7 +762,6 @@ Functions for stills shooting (some of them work for movies, too).
* ``DISP/Q``: toggle between:
* ``Single/Burst/FullHD`` in normal mode
* available matrix sizes (which give the image resolutions) in Hi-Res mode.
* timing (number of clocks to skip after each line) in Slit-scan mode.
Silent picture setting is applied to `intervalometer`_ and `remote triggers`_ when used in LiveView mode.
......@@ -814,18 +803,6 @@ Functions for stills shooting (some of them work for movies, too).
- self-timer mode is on (either 2 second or 10 second, but not continuous)
- `LCD Remote Shot`_ is in ``Away`` mode.
**Picture Quality**
Set picture quality for stills. Available options: RAW, SRAW, MRAW and a few combinations of RAW+JPEG.
Warning: we don't know yet how to open SRAW and MRAW files. Neither DPP nor dcraw/ufraw will open them. Use this option only for testing.
When using SRAW and MRAW, please be aware of the following side effects:
* Display corruption when you use Canon dialogs to change this setting;
* Magic Zoom / Focus Peaking may stop working; press MENU twice to fix them;
* There may be other side effects (not known)
.. _image settings:
Expo
......@@ -995,7 +972,7 @@ Focus
.. _follow focus:
**Follow Focus: OFF / Manual / AutoLock**
**Follow Focus: ON / OFF**
Very simple follow focus (like a rack focus controlled manually).
......@@ -1018,55 +995,8 @@ Focus
To use the default behavior of the arrow keys (i.e. move the AF frame), cover the LCD sensor.
Modes:
* ``Manual``: focus ring moves as long as you hold the key pressed.
* ``AutoLock``: follow focus will stop automatically when a focus peak is detected in current AF frame (in a way similar to `Trap Focus`_). Look at the `focus graph`_ to see when it's about to lock the focus. To focus past the peak point, de-press the button and press it again.
Tip: you can adjust `focus speed`_ (which is multiplied by the *x* from the table above).
.. _custom AF algorithm:
.. _movie af:
**Movie AF: OFF/Hold/Cont**
Experimental autofocus in movie mode. It overrides the default autofocus algorithm.
Modes:
* ``Hold``: AF only works when you press and hold the shutter halfway, or the ``*`` button.
- If you press the Canon AF buton (which is half-shutter or ``*``, depending on your ``CFn.9`` setting), the exposure will be changed during autofocus.
- If you press the other button, the exposure will not change during AF, but the AF will be slower.
* ``Cont``: AF works continuously. It will be faster when you hold the AF button.
* ``CFPk``: a very experimental version which does not use Canon's focus estimation, but focus peaking data. It only uses the center area and computes the absolute value of edge strengths and divides by the image brightness.
**Internals**
To see how the algorithm works, disable any special action for `display`_. You'll see:
* ``NEAR/FAR``: the direction in which it's currently moving the lens.
* percentage of focus change from last step.
* red bar: current *focus step size*, between 0 and 64.
* blue bar: *target focus rate*, which is between 20% and 100% of the *aggressiveness* setting. It is used to adjust the focus step size.
* *mood*, which can be:
- ``!!`` (confused): it doesn't know if it's going in the right way or not, because the focus change rate is too small. It will avoid changing the search direction until focus info becomes better. If you see it hunting in the wrong direction, a quick press of half-shutter or ``*`` will fix this. If you are holding the AF button pressed, de-press it and press it again to reverse the direction.
- ``:)`` (happy): in this case, the focus change rate is high enough and the algorithm believes it's going in the correct direction (and will ignore any hints from you regarding this).
This is a modified gradient descent algorithm. It does not have global convergence, so in strong OOF situations it may not find focus. This can be solved with:
- Better math in the focus evaluation function, which should only have a local max at the perfect focus point. Current functions also have small local maxima in strong OOF regions (besides noise).
- Workarounds to avoid hunting (like the *mood* hack).
Tuning parameters (change with ``Q/DISP``):
* ``A=1..64``: maximum aggressiveness (maximum target % rate of change for focus magnitude).
* ``N=0..9``: noise filter (for focus derivative).
Tip: get an external microphone and place it far away from the camera (AF is noisy)
.. _rack focus:
[[Video:Magic Lantern for Canon 550D - Rack Focus Tutorial|thumb|300px|right|Rack Focus Tutorial by Daniel Thurau]]
......@@ -1328,7 +1258,6 @@ Main shooting screen (outside LiveView)
* Trap Focus status (near MF icon)
* Kelvin temperature (in the white balance box)
* WB shift values for BA and GM
* Flash setting (under clock)
* `HDR`_ setting (under battery icon)
* `MLU`_ setting (under ``Q`` icon)
* `LCD remote`_ status icon: ⨂ ⨀ 〰
......@@ -1382,7 +1311,7 @@ LiveView
* Left side:
* Status for `trap focus`_ / `follow focus`_ / `movie AF`_.
* Status for `trap focus`_ / `follow focus`_.
* Top side:
......@@ -1393,7 +1322,7 @@ LiveView
* Focus Graph
This item is displayed when you enable `Movie AF`_, `Trap Focus`_ or `Follow Focus`_ with AutoLock.
This item is displayed when you enable `Trap Focus`_.
It draws a small graph which shows the *amount* of focus in the AF frame (the little rectangle), over the last few seconds. Focus computation is done by Canon's autofocus algorithm.
......
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