Messages

ok: good news: the cache hack is seems to be working, checking now...

I think we need them, i found them here:

https://bitbucket.org/OtherOnePercent/tragic-lantern-2.0/src/ae7e5e2ec6a7d103fe1bfddb54329e5fc4a1225b/platform/600D.102/consts.h?at=default

how are you guys converting these files? so u can see them in premiere or resolve

Which files?

The glory is not mine, but all the developers.
I just wanted to help the porting, for those who uses the same body.

And dlrpgmsvc: Your efforts are even more valuable than mine, so thank YOU!

@Xaint : you said, some posts ago, that zebras seems not to be aligned. Can you confirm this or do they are ok ? Many thanks ! 

Zebras are ok!!

[dcraw -e IMG_1234.CR2]

Yep, it is a pre-rendered jpeg thumbnail, built into the CR2 raw file itself. And dcraw -e IMG_1234.CR2  will show it.

I'm sorry I meant to say I think that the raw histogram works only in LV and QR . On every model (5D2, 5D3 , 550D and so on)..

(As I guess ) While reviewing the image, ML creates the histogram from the image buffer. Which is a jpeg only (in preview mode), because canons software loads only the jpeg preview from the raw file...
But I don't want to say stupid things... It's just my thinking

Yes, I think there is no raw histogram in review mode. Right?

Yes, i've made the test, the values are almost the same. The histograms update value is 1 sec, so the hand shaking maybe a factor i don't know. Please create some sample pictures at daytime and use a tripod, then post the results here

OK, i think it's depend on the subject/scene (dark room, long exposure...) What you can see in LiveView on the display, I think it's just simulated (Exp.sim). Let's say you set the shutter to 6 seconds, then what you see on the display it's not the real picture so i think maybe here's the difference?

oh i can not express myself... i know a lot of words, but i don't know grammar :D:D

So you say only the overexposure circles are missing?

OK, every settings in its default mode, and after I change the picture quality back to RAW, everything working again

Mystery!

try to go to the wrench menu and then -restore ml defaults- then shut down and restart your 550d so we have same settings, then see if warn circles appear in quick review ... in my 500d not! 

You try it on 500d? or typo?  500D 550D -not the same

EDIT: anyway: it's working after -restore ml defaults too

Ouch !  Here I'm missing something very hard to understand for me ! Why I'm missing the warning circles in the QR mode ?!? 
Can you send me your BIN, please ? Just to check ! Thanks ! 

I checked and double-checked: I get perfectly identical histogram values in lv and qr, BUT in qr there are no warning circles ! 

If you send your bin, then, if the problem persists, it's a matter of values and parameters inside ml or canon menus in my camera. If, otherwise, the problem is gone, then it's a difference in our sources ! 

Sure! Here you go: xaint.hu/autoexec.bin

Yes, I have yet done your modifications some days ago, but the problem is still into the parameters "skip...and so on" I think. You have found the right modifications I already done. Now I inserted your NEW parameters of skippage and dimensions you have lastly found, but I still don't see the overexposure circles in qr that I see in LV, and the ETTR hint data is different from liveview to Quickreview. The problem may be :

[1] The dimensions and skip parameters
[2] The raw photo EDMAC address
[3] The value in sds 3 front state, like discussed here in my latest modifications: https://bitbucket.org/dlrpgmsvc/magic-lantern/commits/3c7ce12b6ec26a796be0030d70aa837783e91ee2
[4] Something else (?)

What do you think ? And: are you sure the skip and dimensions parameters are ok ? You said it's off about 2 pixels on one side and three pixels on other side, so: why you don't correct the skip or dimensions parameters accordingly ? Or is this not correctable ? It's just a curiosity, I know this don't solve our problem so much...

Dunno...

I did a quick test, here's the results:

Histogram on LiveView:


Histogram on Quick Review (LV):


Then Quick Review histogram in Photo Mode (non LiveView):



Now about overexposure circles:

LiveView:


Quick Review:


So I have overexposure circles everywhere (LV, LV->QR, PHOTO_MODE->QR)...


And Auto ETTR is working pretty good i think:

Settings before Auto ETTR:


And after Auto ETTR:


Image after Auto ETTR:


I don't say it is perfect, but works.

[static int stateobj_sdsf3_spy()]

Also, have you managed to follow the hints in the link I posted on the first post of this thread ? I lost myself because I'm not so aquainted with Linux o/s ... so I cannot manage to launch all that mess commands in order to guess the values we need... did you succeeded in some degree ? 

Huh. It will be long!!! 

Yes after running img.py script as a1ex mentioned here:
https://bitbucket.org/hudson/magic-lantern/commits/51cdc8c568c1854183c6b0f4b49eec17da57850a

i've got: 5344, same as it was (like 60D)

However I modified it a bit, so now it looks like this:

Code Select Expand


#if defined(CONFIG_550D)
width = 5344;
height = 3516;
skip_left = 142;
skip_right = 18;
skip_top = 58;
skip_bottom = 10;
#endif


But after I read this again:

For photo histograms, you need to enable CONFIG_RAW_PHOTO in internals.h (look at 5D2/5D3). Then, you need to intercept the raw image buffer from Canon's state object (this is the task that develops the image). The state machine is just like 5D2 one.

You will also have to guess the photo EDMAC. They are only 32 of them (maybe less). It's likely to be the same as on 5D2.

Then, find the offsets until you get raw zebras aligned correctly (1% knows a program that autodetects those, I did them by trial and error). Be careful with bayer grid alignment (top-left pixel should be red, otherwise you have to skip one line and/or column).

I revert those things what i said earlier here:

First thing: sorry for my horrible english

I think,i have successfully enabled raw histogram in quick review mode.
Here are the changes i've made: (dlrpgmsvc please check! )

in raw.c i've add:
...

So forget it!

Then I tried to do what alex said, and as I saw here:
https://bitbucket.org/dlrpgmsvc/magic-lantern/commits/3c7ce12b6ec26a796be0030d70aa837783e91ee2#chg-src/state-object.c
you tried too, without succes?..

First  i've enabled CONFIG_RAW_PHOTO in 550D.109/internals.h:

Code Select Expand

/** We have access to raw data in photo mode too :) */
#define CONFIG_RAW_PHOTO

then in top of  state-object.c i've added:

Code Select Expand

#define SDS_FRONT3_STATE (*(struct state_object **)0x3840)

between the #ifdef CONFIG_550D and #endif lines, so it looks like this:

Code Select Expand


#ifdef CONFIG_550D
#define DISPLAY_STATE DISPLAY_STATEOBJ
#define INPUT_ENABLE_IMAGE_PHYSICAL_SCREEN_PARAMETER 19
#define MOVREC_STATE (*(struct state_object **)0x5B34)
#define LV_STATE (*(struct state_object **)0x4B74)
#define LVCAE_STATE (*(struct state_object **)0x51E4)
#define SDS_FRONT3_STATE (*(struct state_object **)0x3840)   <<<<<<<<<<<<<<<<<<<<<<<<<<<<
#endif


Then, you need to intercept the raw image buffer from Canon's state object

So i've added this:

Code Select Expand


#ifdef CONFIG_550D
if (old_state == 0 && input == 3 && new_state == 1)
     raw_buffer_intercept_from_stateobj();
#endif


into the static int stateobj_sdsf3_spy() function, so now it looks something like this:

Code Select Expand


#ifdef SDS_FRONT3_STATE
static int stateobj_sdsf3_spy(struct state_object * self, int x, int input, int z, int t)
{
    int old_state = self->current_state;
    int ans = StateTransition(self, x, input, z, t);
    int new_state = self->current_state;

    #ifdef CONFIG_5D2
    // SDSf3:(0)  --  3 sdsMem1toRAWcompress-->(1)
    // SDSf3:(1)  --  3 sdsMem1toJpegDevelop-->(1)
    if (old_state == 0 && input == 3 && new_state == 1)
        raw_buffer_intercept_from_stateobj();
    #endif

    #ifdef CONFIG_550D                                  <<<<<<<<<<<<<<<<<<<<<<<<<<<<
    if (old_state == 0 && input == 3 && new_state == 1) <<<<<<<<<<<<<<<<<<<<<<<<<<<<
        raw_buffer_intercept_from_stateobj();           <<<<<<<<<<<<<<<<<<<<<<<<<<<<
    #endif                                              <<<<<<<<<<<<<<<<<<<<<<<<<<<<

    return ans;
}
#endif



But we are not done here..

In raw.c still need to change the RAW_PHOTO_EDMAC address from 0xc0f04A08 to 0xc0f04208,
so I would suggest to modify these lines:

Code Select Expand

#if defined(CONFIG_5D2) || defined(CONFIG_500D) || defined (CONFIG_550D) || defined(CONFIG_600D) || defined(CONFIG_650D) || defined(CONFIG_EOSM) // remove this: defined(CONFIG_550D)
#define RAW_PHOTO_EDMAC 0xc0f04A08
#endif

#if defined(CONFIG_5D3) || defined(CONFIG_6D)
#define RAW_PHOTO_EDMAC 0xc0f04808
#endif

#if defined(CONFIG_60D)
#define RAW_PHOTO_EDMAC 0xc0f04208
#endif


to these:

Code Select Expand


#if defined(CONFIG_5D2) || defined(CONFIG_500D)|| defined(CONFIG_600D) || defined(CONFIG_650D) || defined(CONFIG_EOSM)
#define RAW_PHOTO_EDMAC 0xc0f04A08
#endif

#if defined(CONFIG_5D3) || defined(CONFIG_6D)
#define RAW_PHOTO_EDMAC 0xc0f04808
#endif

#if defined(CONFIG_60D)
#define RAW_PHOTO_EDMAC 0xc0f04208
#endif

#if defined(CONFIG_550D)           <<<<<<<<<<<<<<<<<<<<<<<<<<<<
#define RAW_PHOTO_EDMAC 0xc0f04208 <<<<<<<<<<<<<<<<<<<<<<<<<<<<
#endif                             <<<<<<<<<<<<<<<<<<<<<<<<<<<<




Then inside the int raw_update_params() function,
inside the else if (QR_MODE) branch... (for me it's ~309th lines)

delete this:

Code Select Expand


#ifdef CONFIG_550D
raw_info.buffer = (void*) shamem_read(RAW_PHOTO_EDMAC);
#endif


as you first mentioned here:

I found that this code you added :

#ifdef CONFIG_550D
raw_info.buffer = (void*) shamem_read(RAW_PHOTO_EDMAC);
#endif

Is not needed at all... it don't solve our problem, however we clean out the code a bit...

So now:

[1] The ETTR hint is different
[2] The background red area extension is different


maybe still consist, but let me say that (some stupid thoughts???):

if you examine the histogram in LV, then (i guess) it's come from RAW_LV_EDMAC (in 550D ~2Mpx)

and when you viewing it in QuickReview (through LV after the shot) it's come from RAW_PHOTO_EDMAC, which is differs (maybe )

Maybe stupid thoughts again:

Code Select Expand


#if defined(CONFIG_550D)
width = 5344;
height = 3516;
skip_left = 142;
skip_right = 18;
skip_top = 58;
skip_bottom = 10;
#endif


From a1ex:

Code Select Expand

Be careful with bayer grid alignment (top-left pixel should be red, otherwise you have to skip one line and/or column).

In our cases, the image from the RAW_PHOTO_EDMAC DNG is just a little bit differs from the real RAW file, a very little color difference, and a little misalignment: 2 pixel to the left and 3 pixel down!



[3] The overexposure circles are different (well... in the quickreview there aren't at all)

I have overexposure circles in quick review, and Auto ETTR is working with and without LiveView too!
(Tomorrow morning i will go and do a couple more test shots)

From a1ex:

Then, find the offsets until you get raw zebras aligned correctly

We need  a1ex, who give us some more tips

For now it looks like this:

LV:


Quick Review:


... i think Zebras are not aligned properly

But a1ex will come and corrects things out!

(And again: I hope I make myself clear )

Sorry, does this 18MP dump mean we can have a shutterless image capture in RAW? At full res!

No, without shutter it's only ~2Mpx.

OK, if i comment out this:

Code Select Expand


#ifdef CONFIG_550D
raw_info.buffer = (void*) shamem_read(RAW_PHOTO_EDMAC);
#endif


as you mention, then we don't have raw histogram in Quick Review mode outside LiveView.
I've enabled RAW_DEBUG_DUMP, so ML saves a DNG raw file directly from the RAW image buffer.
Now if we comment out the above, and we are in LiveView, it saves a ~2Mpx DNG, i guess it's come from RAW_LV_EDMAC,
and compute the QuickReview RAW Histogram from that ~2Mpx RAW. So we have QuickReview RAW histogram if we came from LV.
But when you just take a pic, without turning on LiveView, then for me RAW_DEBUG_DUMP reports the error: Photo raw buffer null!

So as i guess if we have this:

Code Select Expand


#ifdef CONFIG_550D
raw_info.buffer = (void*) shamem_read(RAW_PHOTO_EDMAC);
#endif


then it doesn't matter where we are: in LiveView mode, or not in LiveView, RAW_DEBUG_DUMP saves a 18Mpx DNG from both 2 cases,
and we have the RAW Histogram in Quick Review mode.

I hope I make myself clear

First we need to find even more correct values for this:

Code Select Expand


#if defined(CONFIG_550D)
width = 5344;
height = 3516;
skip_left = 142;
skip_right = 0;
skip_top = 50;
#endif


because as i said it was just a guess
btw i'm on it

One question: why, if raw histogram enabled, the live view shows raw histo and then the quick review show the normal histo ? Do this is normal ? Do we must enable some option to have raw histo ALSO on the quick review ? Many thanks in advance for your replies !

First thing: sorry for my horrible english

I think,i have successfully enabled raw histogram in quick review mode.
Here are the changes i've made: (dlrpgmsvc please check! )

in raw.c i've add:

Code Select Expand


#if defined(CONFIG_550D)
#define RAW_PHOTO_EDMAC  0xc0f04208
#endif


same as 60D.


Then inside the raw_update_params() function
inside the else if (QR_MODE) branch... (for me it's ~309th lines)
right below this:

Code Select Expand

raw_info.buffer = (void*) raw_buffer_photo;

added:

Code Select Expand


#ifdef CONFIG_550D
raw_info.buffer = (void*) shamem_read(RAW_PHOTO_EDMAC);
#endif
 

again: same as 60D

Then below these, where we need to define the Raw buffer size for photos ( below the long commented thing )
i've added:

Code Select Expand


#if defined(CONFIG_550D)
width = 5344;
height = 3516;
skip_left = 142;
skip_right = 0;
skip_top = 50;
#endif


same as 60D i guess, but i'm not sure, I'll look into it now...


Thats it, dlrpgmsvc please check if it's working to you or not...
If so, then you can change the "Current state-of-the-art:"

With these modifications i can see the raw histogram in Quick Review mode:

LiveView:


Quick Review:


It's working without LiveView too.

dlrpgmsvc: I think it only works in RGB mode. Am I right?