Messages

Thanks Nikfreak, I'll try the debug.c and dont click me method.

eNnvi tried to make soms builds for the 6d.
Only they didn't work perfect.
I asked eNnvi for the raw.c and edmac-memcpy.c file so I could test some stuff.
eNnvi doesn't have a 6d, but seems to know somebody else with a 6d who also tested the builds.

[#ifdef CONFIG_EDMAC_RAW_SLURP /* params useful for hardcoding buffer sizes, according to video mode */ int mv = is_movie_mode(); int mv720 = mv && video_mode_resolution == 1; int mv1080 = mv && video_mode_resolution == 0; int mv640 = mv && video_mode_resolution == 2; int mv1080crop = mv && video_mode_resolution == 0 && video_mode_crop; int mv640crop = mv && video_mode_resolution == 2 && video_mode_crop; /* note: 6D reports 129 = 0x81 for zoom x1, and it behaves just like plain (unzoomed) LiveView) */ int zoom = (lv_dispsize & 0xF) > 1; /* silence warnings; not all cameras have all these modes */ (void)mv640; (void)mv720; (void)mv1080; (void)mv640; (void)mv1080crop; (void)mv640crop; (void)zoom; #ifdef CONFIG_5D3 /* don't know how to get the resolution without relying on Canon's lv_save_raw */ *width = zoom ? 3744 : mv720 ? 2080 : 2080; *height = zoom ? 1380 : mv720 ? 692 : 1318; /* height must be exact! copy it from Debug->EDMAC */ return 1; #endif #ifdef CONFIG_60D *width = zoom ? 2520 : mv640crop ? 920 : mv720 || mv640 ? 1888 : 1888; *height = zoom ? 1106 : mv640crop ? 624 : mv720 || mv640 ? 720 : 1182; return 1; #endif #ifdef CONFIG_600D *width = zoom ? 2520 : mv1080crop ? 1952 : mv720 ? 1888 : 1888; *height = zoom ? 1106 : mv1080crop ? 1048 : mv720 ? 720 : 1182; return 1; #endif #if defined(CONFIG_650D) || defined(CONFIG_700D) *width = zoom ? 2592 : mv1080crop ? 1872 : mv720 ? 1808 : 1808; *height = zoom ? 1108 : mv1080crop ? 1060 : mv720 ? 720 : 1190; return 1; #endif #ifdef CONFIG_EOSM *width = video_mode_crop ? 1872 : 1808; *height = video_mode_crop ? 1060 : 727; return 1; #endif #ifdef CONFIG_6D *width = zoom ? 2768 : mv720 ? 1920 : 1920; *height = zoom ? 634 : mv720 ? 720 : 1208; /* find correct mv720 height -- must be exact! */ return 1; #endif/ silent picture in 1080 mode = 1830 x 1224 // silent picture in 720 mode = 1830 x 634 // silent picture in zoom mode = 2688 x 960 // image buffers 1080 mode (in debug menu) shows 720 x 480, 1808 x 1206 // Some EDMAC channels show 3360 x 1207 or 3616 x 1205 / / image buffers 720 mode (in debug menu) shows 720 x 480, 1280 x 720 // Some EDMAC channels show 2560 x 720 or 2560 x 719 or 3360 x 719 // image buffers in 1080 zoom are 720x480, 1104x736 // Some EDMAC channels show 2208 x 736 or 2208 x 735 or 4844 x 633 / #ifdef CONFIG_7D *width = zoom ? 2520 : mv1080crop ? 1952 : mv720 ? 1888 : 1888; *height = zoom ? 1106 : mv1080crop ? 1048 : mv720 ? 720 : 1182; return 1; #endif /* unknown camera? */ return 0;]

Ok, I tested a lot today and allmost  all I saw were frames that could be described as a pink mess 
There is one setting which gives me scrambled pink frames, so still a mess, but you can recognize some stuff in it.
Free edmac channel
uint32_t raw_write_chan = 0x12;
and dma flag
  uint32_t dmaFlags = 0x20000000;

But I also find some resolution settings furtheron in the raw.c file.
Could it be that the scrambled picture is caused by faulty settings in this part of raw.c

#ifdef CONFIG_EDMAC_RAW_SLURP

    /* params useful for hardcoding buffer sizes, according to video mode */
    int mv = is_movie_mode();
    int mv720 = mv && video_mode_resolution == 1;
    int mv1080 = mv && video_mode_resolution == 0;
    int mv640 = mv && video_mode_resolution == 2;
    int mv1080crop = mv && video_mode_resolution == 0 && video_mode_crop;
    int mv640crop = mv && video_mode_resolution == 2 && video_mode_crop;
   
    /* note: 6D reports 129 = 0x81 for zoom x1, and it behaves just like plain (unzoomed) LiveView) */
    int zoom = (lv_dispsize & 0xF) > 1;

    /* silence warnings; not all cameras have all these modes */
    (void)mv640; (void)mv720; (void)mv1080; (void)mv640; (void)mv1080crop; (void)mv640crop; (void)zoom;

    #ifdef CONFIG_5D3
    /* don't know how to get the resolution without relying on Canon's lv_save_raw */
    *width  = zoom ? 3744 : mv720 ? 2080 : 2080;
    *height = zoom ? 1380 : mv720 ?  692 : 1318;    /* height must be exact! copy it from Debug->EDMAC */
    return 1;
    #endif

    #ifdef CONFIG_60D
    *width  = zoom ? 2520 : mv640crop ? 920 : mv720 || mv640 ? 1888 : 1888;
    *height = zoom ? 1106 : mv640crop ? 624 : mv720 || mv640 ?  720 : 1182;
    return 1;
    #endif

    #ifdef CONFIG_600D
    *width  = zoom ? 2520 : mv1080crop ? 1952 : mv720  ? 1888 : 1888;
    *height = zoom ? 1106 : mv1080crop ? 1048 : mv720  ?  720 : 1182;
    return 1;
    #endif
   
    #if defined(CONFIG_650D) || defined(CONFIG_700D)
    *width  = zoom ? 2592 : mv1080crop ? 1872 : mv720  ? 1808 : 1808;
    *height = zoom ? 1108 : mv1080crop ? 1060 : mv720  ?  720 : 1190;
    return 1;
    #endif

    #ifdef CONFIG_EOSM
    *width  = video_mode_crop ? 1872 : 1808;
    *height = video_mode_crop ? 1060 : 727;
    return 1;
    #endif

    #ifdef CONFIG_6D
    *width  = zoom ? 2768 : mv720 ? 1920 : 1920;
    *height = zoom ?  634 : mv720 ?  720 : 1208;    /* find correct mv720 height -- must be exact! */   
    return 1;
    #endif
/ silent picture in 1080 mode = 1830 x 1224 /
/ silent picture in 720 mode = 1830 x 634 /
/ silent picture in zoom mode = 2688 x 960 /
/ image buffers 1080 mode (in debug menu) shows 720 x 480, 1808 x 1206 /
/ Some EDMAC channels show 3360 x 1207 or 3616 x 1205 /
/ image buffers 720 mode (in debug menu) shows 720 x 480, 1280 x 720 /
/ Some EDMAC channels show 2560 x 720 or 2560 x 719 or 3360 x 719 /
/ image buffers in 1080 zoom are 720x480, 1104x736 /
/ Some EDMAC channels show 2208 x 736 or 2208 x 735 or 4844 x 633 /
   
   #ifdef CONFIG_7D
    *width  = zoom ? 2520 : mv1080crop ? 1952 : mv720  ? 1888 : 1888;
    *height = zoom ? 1106 : mv1080crop ? 1048 : mv720  ?  720 : 1182;
    return 1;
    #endif

    /* unknown camera? */
    return 0;


For 6d I tried some different settings, but I'm not sure which resolutions to put where, so I added some text in the file which shows resolutions of silent pics and image buffers and edmac channels.
Does somebody have an idea which numbers to use ?

    #ifdef CONFIG_6D
    *width  = zoom ? 2768 : mv720 ? 1920 : 1920;
    *height = zoom ?  634 : mv720 ?  720 : 1208;    /* find correct mv720 height -- must be exact! */   
    return 1;
    #endif
/ silent picture in 1080 mode = 1830 x 1224 /
/ silent picture in 720 mode = 1830 x 634 /
/ silent picture in zoom mode = 2688 x 960 /
/ image buffers 1080 mode (in debug menu) shows 720 x 480, 1808 x 1206 /
/ Some EDMAC channels show 3360 x 1207 or 3616 x 1205 /
/ image buffers 720 mode (in debug menu) shows 720 x 480, 1280 x 720 /
/ Some EDMAC channels show 2560 x 720 or 2560 x 719 or 3360 x 719 /
/ image buffers in 1080 zoom are 720x480, 1104x736 /
/ Some EDMAC channels show 2208 x 736 or 2208 x 735 or 4844 x 633 /

Thanks @Dfort
I already got the debug option working, but ran out off battery...

It's a new day and got a fully loaded battery

[../../src/raw.c:2113:18: error: 'lv_raw_type' undeclared here (not in a function) .priv = &lv_raw_type, ^make: *** [raw.o] Error 1]

@dfort

I did the #define thing on RAW_DEBUG_TYPE
But I get this error with compiling
../../src/raw.c:2113:18: error: 'lv_raw_type' undeclared here (not in a function)
         .priv = &lv_raw_type,
                  ^
make: *** [raw.o] Error 1


Tried some different edmac channels, changing the edmac-memcpy.c, but so far, no luck.
Got one black live view and one really slow live view, like 5 fps or something.
Would be a lot quicker if you can define it in the debug menu.

@Alex
I can conform that using
uint32_t dmaFlags = 0x40000000

gives the same results as
uint32_t dmaFlags = 0x20000000

pink garbage frames 

Thanks, that was the missing piece. Compiled a build with working live view myself.
Now it's time to do some testing 

I wanted to do some testing, but can't get it to work.

I've downloaded the latest magic lantern 'raw_video_10bit_12bit' branch from https://bitbucket.org/hudson/magic-lantern
And I've got an altered 'raw.c' file and an altered 'edmac-memcpy.c' file from eNnvi, which I put in the latest version of raw_video_10_12bit branch, I overwrite the original raw.c and edmac-memcpy.c files.

Then I go to platforms and make a new build for the 6d.
But when I test this new build, live view freezes... (Although the recorded 10bit MLV files give good frames)
While eNnvi got me some builds where live view doesn't freeze ?
Am I doing something wrong here, as far as I understand the only two files altered for using RAW SLURP are the raw.c and the edmac-memcpy.c files ?

[uint32_t dmaFlags = 0x20000000;]

Alex, are you asking me to try those values on the 6d ?

So instead of:
uint32_t dmaFlags = 0x20000000;
Try out:
uint32_t dmaFlags = 0x60000000; (or  uint32_t dmaFlags = 0x40000000;

@NikFreak

It is safe to try it out. Both settings won't brick your camera.

That's all I need to know 

['raw.c']

As seen some post before, eNnvi tried to make CONFIG_EDMAC_RAW_SLURP work on the 6d.
One thing is working, live view doesn't freeze anymore when recording 10/12 bit on the 6d 
However new problem now is, the recording gives scrambled/pink frames 

So we're halfway there...
Since live view works, the address for CONFIG_EDMAC_RAW_SLURP is probably right and looks like this in the 'raw.c' file:
#ifdef CONFIG_6D
// found at 0xFFCE513C (ram func)
#define DEFAULT_RAW_BUFFER MEM(0x76d6c + 0x2C)
#endif

Question is now, why do we end up with scrambled/pink frames. Are we not using a right free edmac channel in 'edmac-memcpy.c' ?
which is configured as follows:
#if defined(CONFIG_650D) || defined(CONFIG_700D) || defined(CONFIG_EOSM) || defined(CONFIG_6D)
uint32_t raw_write_chan = 0x12;
#endif

I'm not an expert in this, but I'm wondering why some camera addresses are written as 0xXX and for other camera's like the 5d3 for example as a plain normal number:

/* for other cameras, find a free channel with find_free_edmac_channels  */
#ifdef CONFIG_5D3
uint32_t raw_write_chan = 4;
#endif

I'm wondering if I could brick my camera when trying out a normal written number address for the 6d like:
#ifdef CONFIG_6D
uint32_t raw_write_chan = 8;
#endif

eNnvi mentions that the scrambled/pink frames problem could also be due to wrong edmac flag settings.
We tried both options for 6d, the first one gives pink frames, the second gives scrambled frames.
/* see wiki, register map, EDMAC what the flags mean. they are for setting up copy block size */
#if defined(CONFIG_650D) || defined(CONFIG_700D) || defined(CONFIG_EOSM) || defined(CONFIG_6D)
    uint32_t dmaFlags = 0x20000000;
#else
    uint32_t dmaFlags = 0x20001000;
#endif

So anybody got suggestions how to get this working, and is it safe to try out some different free edmac channels, or will it brick my camera when I pick the wrong one?

 

At this moment a bunch of camera have working live view while recording 10/12 bit (5D3, 60D, 600D, 650D, 700D and the EOS-M)
other ones have freezing live view while recording 10/12 bit video.

Wow, nice compression -> 3.75MB to 1.9 MB 
Didn't expect that much, most of CR2 files from the 6d are 25MB in size, uncompressed should be about 35MB...

Can't resist too ask 
Does it handle 10 bit files ?

your eos-m video on youtube looks like it needs some vertical unstretching

Now the question most of us are thinking off   
Does get some chip(probably the digic) fried inside when this functions is used 25 frames per second 

[not decoded]

What do you mean with the 1920 x 1080 not decoded ?
Do you mean you can make the file but can't decode it ?
Isn't this standard canon cr2 files what you're making here, which should be read by almost all raw editors out there.

You need firmware 1.1.6.
It's still available on the canon website from Canada.
You can download the firmware and run it as a firmware update in camera

Great work eNnvi 
Rawslurp for 6d.
Happily willing to test, is the source somewhere available on bitbucket?

I'm just following orders 

The enemy here is the h.264 compression.
h.264 is made to compress, it will look for areas with small color and brightness difference and compress it in a way that it gets the same color/brightness values and thus saving data(and losing detail).
So what do you think happens when you feed h.264 a flat, low contrast image...it will find lot's of areas with detail that has such small difference in color/brightness values, that it can compress the hell out of it 

Maybe you should experiment in filming the same scene with two different picture styles, one flat, desaturated profile and another profile, like 'landscape'.
I think the non flat picture profiles gives you bigger files, even with All-i compression.

That said, you can't color correct much in a non flat picture profile...

Run the program on my 1000d which has version 1.0.7 canon firmware.
Searched the log file:

write_bootflag signature:

ffff5fe0 : e92d41f0
ffff5fe4 : e1a05001
ffff5fe8 : e3a04000
ffff5fec : e3500000
ffff5ff0 : 13a0733e

read_bootflag signature:
Couldn't find something exactly similar, but I did found this

ffff60d0 : e52de004
ffff60d4 : e3500000
ffff60d8 : 13a0333e
ffff60dc : 12833a02
ffff60e0 : 13a020aa

My logfile:
https://drive.google.com/drive/folders/0B1BxGc3dfMDaRUZweUJ5NWZUTTQ?usp=sharing

And...enable the modules in the module tab 

@Syscall keep up the good work 
Will check it out tomorrow and send the log file

Luckiliy your 1000d is no longer a brick

Ah, good it was not your main camera
But you need to unbrick it, otherwise I don't dare to try more stuff on the 1000d

My main camera is a 6d, but I'd rather have my 1000d as a backup cam instead of a brick to stabilize my tripod

  
@Syscall
Just wondering, is the 1000d your main camera, your one and only camera?