Author Topic: 600D Audio Controls?  (Read 145871 times)

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #225 on: August 02, 2012, 10:17:28 AM »
it has
 priv, -1,0, 1);  in yours

?? which line??
toggle's delta is 1
toggle_reverse's delta is -1

are correct, I believe

1%

  • Developer
  • Hero Member
  • *****
  • Posts: 5936
  • 600D/6D/50D/EOSM/7D
Re: 600D Audio Controls?
« Reply #226 on: August 02, 2012, 01:58:03 PM »
I figured audio would not be recorded even though meters work with audio off, it would only make sense.  My plan was to call the canon functions that tell the MVR to write sound to the file when rec is pressed. I'll have to test all of that but doesn't seem that difficult. Then we are free of canon and the ALC and I think lose some overhead from canon sound processes running.

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #227 on: August 02, 2012, 02:32:36 PM »
Oh no.
I was miss taken writing English.
I want to say that we do not start testing with autoexex.bin until August 13.

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #228 on: August 02, 2012, 03:43:22 PM »
No, It's my code. which 1%'s function are you talking?
I suppose this:


Code: [Select]
extern void power_mic_only()
{
audio_ic_write(ML_PW_IN_PW_MNG | 0x0a);
audio_ic_write(ML_REC_RECPLAY_STATE | 0x11);
if (volwrites ==1 )   
{   // If we're controlling volume set it.
audio_configure( 1 );
}
    else { // If we're not we need this

audio_ic_write( ML_PW_MIC_IN_VOL | 0x3f ); // Mic was too quiet, had to tap it.
// audio_ic_write(ML_PW_MIC_BOST_VOL | 0x10); // Some boost too
// audio_ic_write(ML_MIXER_VOL_CTL | 0x10);
// audio_ic_write(ML_DVOL_CTL | 0x2e);
// audio_ic_write(ML_PW_AMP_VOL_FUNC | 0x01);
audio_ic_write(ML_FILTER_EN | 0x03); // Noise Filter and High Pass
// audio_ic_write(0xe101);
// audio_ic_write(ML_NODOC_E5 | 0x06); // Don't need EQs
}
}
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #229 on: August 02, 2012, 03:46:01 PM »
?? which line??
toggle's delta is 1
toggle_reverse's delta is -1

are correct, I believe

posted the wrong one before:

 
Code: [Select]
static void audio_hpf2config_toggle( void * priv, int delta )
 {
-    menu_numeric_toggle(priv, -1, 0, 7);
+    menu_numeric_toggle(priv, 1, 0, 7);
     audio_ic_set_filters();
 }

line 1709


also added the AGC value display line 369:


Code: [Select]
#endif
         }
-#ifndef CONFIG_600D
         if (gui_menu_shown() && alc_enable)
         {
-                int dgain_x1000 = audio_cmd_to_gain_x1000(audio_ic_read(AUDIO_IC_ALCVOL));
+#ifdef CONFIG_600D
+            int dgain_x1000 = audio_cmd_to_gain_x1000(audio_ic_read(ML_ALC_TARGET_LEV-0x100));
+#else
+            int dgain_x1000 = audio_cmd_to_gain_x1000(audio_ic_read(AUDIO_IC_ALCVOL));
+#endif
                 bmp_printf(FONT_MED, 10, 410, "AGC:%s%d.%03d dB", dgain_x1000 < 0 ? "-" : " ", ABS(dgain_x1000) / 1000, ABS(dgain_x1000) % 1000);
         }
-#endif
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

coutts

  • Developer
  • Senior
  • *****
  • Posts: 401
Re: 600D Audio Controls?
« Reply #230 on: August 02, 2012, 03:55:24 PM »
so, did that register map help you guys out?  :)

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #231 on: August 02, 2012, 04:37:33 PM »
@coutts
Yes yes! Thank you

Scrax
Today I'm away from my home.
Will pull your request when I go back to home.
Thank you.

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #232 on: August 02, 2012, 05:51:51 PM »
@miyake
going to play mode and back will bring back on audio override after switching them off.

Yeah, I've managed to make them come back after swithcing audio overrideoff.
I've made a audio_ic_on function that will revert audio ic off settings:

static void
audio_ic_on(){
    audio_ic_write(ML_MIC_BOOST_VOL1 | 0x03); // max boost1
    audio_ic_write(ML_MIC_BOOST_VOL2 | 0x00); // boos2 combo
    audio_ic_write(ML_MIC_IN_VOL | ML_MIC_IN_VOL_8); // max vol
    audio_ic_write(ML_PW_ZCCMP_PW_MNG | 0x01); //power on
   
    audio_ic_write(ML_RECPLAY_STATE | ML_RECPLAY_STATE_MON);
    audio_ic_write(ML_MIC_IN_VOL | ML_MIC_IN_VOL_8);
    audio_ic_write(ML_HPF2_CUTOFF | ML_HPF2_CUTOFF_FREQ200);
    audio_ic_write(ML_FILTER_EN | ML_FILTER_EN_HPF_BOTH);
    audio_ic_write(ML_MIXER_VOL_CTL | ML_MIXER_VOL_CTL_RCH_USE_LR);
    audio_ic_write(ML_REC_LR_BAL_VOL | 0x00);
}

Try to see if it's good, on my fork it works, will push it now.
Also pushed a fix for digital gain icon going reverse and enabled audio remote shoot for 600D

i've not tested audio monitoring because can't find the cable right now...
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #233 on: August 02, 2012, 06:45:50 PM »
so, did that register map help you guys out?  :)
thank's coutts I'm starting to understand a lot more now :)
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #234 on: August 02, 2012, 09:44:12 PM »
Just merged scrax's code. will check it.

g3gg0

  • Developer
  • Hero Member
  • *****
  • Posts: 3169
Re: 600D Audio Controls?
« Reply #235 on: August 02, 2012, 10:23:41 PM »
really exhaustive configuration possibilities :)
good work!
Help us with datasheets - Help us with register dumps
magic lantern: 1Magic9991E1eWbGvrsx186GovYCXFbppY, server expenses: paypal@g3gg0.de
ONLY donate for things we have done, not for things you expect!

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #236 on: August 03, 2012, 05:16:52 AM »
@scrax
Quote
going to play mode and back will bring back on audio override after switching them off.
I'm sorry for my poor English . I can't find any problems. Do you want to tell me this sentence has problem was gone??


Quote
Yeah, I've managed to make them come back after swithcing audio overrideoff.
I've made a audio_ic_on function that will revert audio ic off settings:
Works perfectoly!!!

Quote
i've not tested audio monitoring because can't find the cable right now...

me too


Anyway, It has no problem now, I think.  great work scrax!!
Do you know any other problems?


juantrueno

  • New to the forum
  • *
  • Posts: 27
  • Mercenario AudioVisual
Re: 600D Audio Controls?
« Reply #237 on: August 03, 2012, 06:10:00 AM »
Thanks to all who are working on this project!
i'm ready to test!
Thanks again!
Canon 600D. Canon 18-135mm f 4/5.6 / 50mm f 1.8 / Yashica (Análogos) 28mm f 2.8 / 50mm f 1.4 / 135mm f 2.8
Vimeo.com/juantrueno youtube.com/juakinyan @JuanTrueno

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #238 on: August 03, 2012, 11:04:28 AM »
Hook-able point video memo.

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #239 on: August 03, 2012, 01:42:04 PM »
Anyway, It has no problem now, I think.  great work scrax!!
Do you know any other problems?
I can't hear differences in the audio recorded with wind filter on or off. But visually I see changes in meters.
So it's not a problem yet but something to investigate.

The first sentence was written before adding audio_ic_on to the code, so don't mind it.
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #240 on: August 03, 2012, 02:11:02 PM »
I see

So we need to check
 -High pass filter
 -Ext balanced(I guess, your patch broken it.)
 -monitor
 -auto int/ext (But just added codes, check my repo)

One more thing, I'm logged on my repo(already deleted) which is debugging function. It's like a console printf().
It's very useful for me.So you can copy/past it , if you want.
https://bitbucket.org/miyake_t/magic-lantern600daudio/changeset/1fecaf1b1fff62b39d4b30c4669ecbd68d8b1eba

johndb

  • New to the forum
  • *
  • Posts: 25
  • 600D: Amateur Photographer and Videographer
Re: 600D Audio Controls?
« Reply #241 on: August 03, 2012, 02:18:05 PM »
I am looking forward to testing the new 600D audio when you you are that stage. It would appear that you are very close to having it completed to the point that it would be ready for testing. Thank you all for your hard work. I'm taking a road trip through the west coast of Canada and the US in two weeks and I sure would like the enhanced ML audio.
600D ML | 450D | EF-S 17-55mm f/2.8 IS USM, EF-S 60mm f/2.8 Macro USM, EF 70-300mm f/4-5.6 IS USM, Speedlite 580EX II, Azden SMX-10 Microphone; Sony Vegas HD Platinum, DxO Optics Pro, DxO Filmpack, Oloneo HDR Photoengine

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #242 on: August 03, 2012, 02:56:12 PM »
@johndb
envy you. Is it a summer holiday or vacation?

@scrax
Added compatibility issue solving codes. pull it.
and I found Canon AV cable. But I have no connector conversion equipment.

Today, I'm coding ML with drinking Japanese SHOCHU(kind of SAKE). It's really delicious.
I'm waiting to yours coming to Japan.

johndb

  • New to the forum
  • *
  • Posts: 25
  • 600D: Amateur Photographer and Videographer
Re: 600D Audio Controls?
« Reply #243 on: August 03, 2012, 03:42:56 PM »
@johndb
envy you. Is it a summer holiday or vacation?

Yes, I'm taking a vacation. I'll be in San Francisco during the America's Cup Sailing Race and will be shooting some footage and stills.

Today, I'm coding ML with drinking Japanese SHOCHU(kind of SAKE). It's really delicious.
I'm waiting to yours coming to Japan.

Enjoy your SHOCHU! You deserve it. @scrax, @1%, and @coutts and everyone else that worked on this project deserves some too  :)
600D ML | 450D | EF-S 17-55mm f/2.8 IS USM, EF-S 60mm f/2.8 Macro USM, EF 70-300mm f/4-5.6 IS USM, Speedlite 580EX II, Azden SMX-10 Microphone; Sony Vegas HD Platinum, DxO Optics Pro, DxO Filmpack, Oloneo HDR Photoengine

obiyan19

  • New to the forum
  • *
  • Posts: 20
Re: 600D Audio Controls?
« Reply #244 on: August 03, 2012, 04:41:28 PM »
hi,

just a new here, from france. I am in admiration for all the job done here. congrats to all ! If you need another tester on 600d, i am here.  :D
600D + 7D + 5D2  // 24-105 L is ~ 100-400 L is ~ 18-200 is ~ 18-55 isII ~ sigma 50 f1.4 EX

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 600D Audio Controls?
« Reply #245 on: August 03, 2012, 08:08:13 PM »
Audio mointoring seems not working, I found the cable too. plugged in in a tv an i can hear audio from what recorded but not with audio monitoring on. Will try 1% code too to see if there it works
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #246 on: August 04, 2012, 04:36:58 AM »
(lol
The code is nothinkg .
Will try to add framework asap.
We need to add IC configration by PDF P38

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #247 on: August 04, 2012, 05:00:41 AM »
Just added framework. Let's discover what reg value is answer.

audio_ic_lineout_*

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #248 on: August 04, 2012, 07:11:16 AM »
Override succeed when we plugged in the USB-RCA cable.

difficult...
 -can't use PTP because USB port is already plugged-in

miyake

  • Developer
  • Senior
  • *****
  • Posts: 396
Re: 600D Audio Controls?
« Reply #249 on: August 04, 2012, 12:27:10 PM »
Audio mointoring seems not working, I found the cable too. plugged in in a tv an i can hear audio from what recorded but not with audio monitoring on. Will try 1% code too to see if there it works

If you know 1%'s code is working, you can get regdump from working situation.
Then simply diff ,
Then we can understand what reg we needed.

Anyway, I will away today.