This should help you understand better how it works and how to expose the pictures:
http://acoutts.com/a1ex/split_MG_8792.dng
http://acoutts.com/a1ex/split_MG_8792.dng
Etiquette, expectations, entitlement...
@autoexec_bin | #magiclantern | Discord | Reddit | Server issues
This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to.
Show posts MenuQuoteFrom now on, it's your job to get it fully working.
Quote from: pit3k on August 01, 2013, 03:29:25 PM
I think the cr2hdr needs a little bit of tweaking to leave alone the mids, and work with only highlights and shadows.
diff -r af0907c14c7d platform/7D.203/Makefile.setup.default
--- a/platform/7D.203/Makefile.setup.default Thu Aug 01 14:44:07 2013 +0300
+++ b/platform/7D.203/Makefile.setup.default Thu Aug 01 15:32:27 2013 +0300
@@ -12,5 +12,6 @@
video_hacks.o \
misc.o \
ptpbuf.o \
+ raw.o \
afma.o
diff -r af0907c14c7d platform/7D.203/internals.h
--- a/platform/7D.203/internals.h Thu Aug 01 14:44:07 2013 +0300
+++ b/platform/7D.203/internals.h Thu Aug 01 15:32:27 2013 +0300
@@ -102,3 +102,5 @@
/** We can record movies in regular photo modes - M, P, Tv, Av... */
#define CONFIG_NO_DEDICATED_MOVIE_MODE
+
+#define CONFIG_RAW_PHOTO
diff -r af0907c14c7d src/raw.c
--- a/src/raw.c Thu Aug 01 14:44:07 2013 +0300
+++ b/src/raw.c Thu Aug 01 15:32:27 2013 +0300
@@ -58,6 +58,8 @@
#define RAW_LV_EDMAC 0xC0F26208
#endif
+#define RAW_LV_EDMAC 0xC0F26208
+
/**
* Photo-mode raw buffer address
* On old cameras, it can be intercepted from SDSf3 state object, right after sdsMem1toRAWcompress.
@@ -67,7 +69,7 @@
* and http://a1ex.bitbucket.org/ML/states/ for state diagrams.
*/
-#if defined(CONFIG_5D2) || defined(CONFIG_50D) || defined(CONFIG_500D) || defined(CONFIG_600D) || (defined(CONFIG_DIGIC_V) && !defined(CONFIG_FULLFRAME))
+#if defined(CONFIG_5D2) || defined(CONFIG_50D) || defined(CONFIG_500D) || defined(CONFIG_600D) || (defined(CONFIG_DIGIC_V) && !defined(CONFIG_FULLFRAME)) || defined(CONFIG_7D)
#define RAW_PHOTO_EDMAC 0xc0f04A08
#endif
@@ -140,7 +142,7 @@
* It will also work with the values from some other camera, but colors may be a little off.
**/
-#ifdef CONFIG_5D2
+#ifdef CONFIG_7D
//~ { "Canon EOS 5D Mark II", 0, 0x3cf0,
//~ { 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } },
#define CAM_COLORMATRIX1 \
@@ -242,7 +244,7 @@
* This is only used in photo LiveView, where we can't compute it
*/
-#ifdef CONFIG_5D3
+#ifdef CONFIG_7D
static int dynamic_ranges[] = {1097, 1087, 1069, 1041, 994, 923, 830, 748, 648, 552, 464};
#endif
@@ -531,6 +533,13 @@
skip_left = 72;
skip_top = 52;
#endif
+
+ #ifdef CONFIG_7D
+ width = 5360;
+ height = 3516;
+ skip_left = 160;
+ skip_top = 52;
+ #endif
dbg_printf("Photo raw buffer: %x (%dx%d)\n", raw_info.buffer, width, height);
dbg_printf("Skip left:%d right:%d top:%d bottom:%d\n", skip_left, skip_right, skip_top, skip_bottom);
@@ -559,6 +568,7 @@
prev_zoom = zoom;
}
+ #ifdef CONFIG_RAW_LIVEVIEW
/* in zoom mode: yuv position changed? force a refresh */
if (lv_dispsize > 1)
{
@@ -574,6 +584,7 @@
prev_delta_x = delta_x;
prev_delta_y = delta_y;
}
+ #endif
if (dirty)
{
@@ -700,6 +711,8 @@
int preview_skip_top = skip_top;
int preview_width = raw_info.jpeg.width;
int preview_height = raw_info.jpeg.height;
+
+ #ifdef CONFIG_RAW_LIVEVIEW
if (lv_dispsize > 1)
{
int delta_x, delta_y;
@@ -742,6 +755,7 @@
preview_height = vram_hd.height / zoom_corr;
}
}
+ #endif
raw_set_preview_rect(preview_skip_left, preview_skip_top, preview_width, preview_height);
diff -r af0907c14c7d src/state-object.c
--- a/src/state-object.c Thu Aug 01 14:44:07 2013 +0300
+++ b/src/state-object.c Thu Aug 01 15:32:27 2013 +0300
@@ -17,6 +17,7 @@
#ifdef CONFIG_7D
#define LV_STATE (*(struct state_object **)0x4458)
+#define SDS_FRONT3_STATE (*(struct state_object **)0x32DC)
#endif
#ifdef CONFIG_7D_MASTER
@@ -358,7 +359,7 @@
int ans = StateTransition(self, x, input, z, t);
int new_state = self->current_state;
- #if defined(CONFIG_5D2) || defined(CONFIG_550D)
+ #if defined(CONFIG_5D2) || defined(CONFIG_550D) || defined(CONFIG_7D)
// SDSf3:(0) -- 3 sdsMem1toRAWcompress-->(1)
// SDSf3:(1) -- 3 sdsMem1toJpegDevelop-->(1)
if (old_state == 0 && input == 3 && new_state == 1)
diff -r af0907c14c7d src/zebra.c
--- a/src/zebra.c Thu Aug 01 14:44:07 2013 +0300
+++ b/src/zebra.c Thu Aug 01 15:32:27 2013 +0300
@@ -827,6 +827,7 @@
int can_use_raw_overlays_photo()
{
+ return 1;
// MRAW/SRAW are causing trouble, figure out why
// RAW and RAW+JPEG are OK
if ((pic_quality & 0xFE00FF) == (PICQ_RAW & 0xFE00FF))
Page created in 0.302 seconds with 15 queries.