| Thursday, December 9th, 2010, 00:00 UTC | ||
| [00:00:44] | Dave123-road (Dave123-road!~dave@cpe-74-74-222-96.rochester.res.rr.com) has quit (Quit: Leaving) | |
| [00:15:36] | gkeen316 (gkeen316!~gkeen316@d75-156-147-11.abhsia.telus.net) has quit (Ping timeout: 250 seconds) | |
| [01:04:17] | castlec (castlec!~christoph@cpe-76-181-105-97.insight.res.rr.com) has joined #mythtv | |
| [01:29:38] | PointyPumper (PointyPumper!~pintlezz@190.244.73.13) has quit () | |
| [01:35:26] | plut0 (plut0!~cory@cpe-74-76-182-29.nycap.res.rr.com) has joined #mythtv | |
| [01:35:38] | plut0 (plut0!~cory@cpe-74-76-182-29.nycap.res.rr.com) has left #mythtv () | |
| [01:37:46] | sphery: | markk_: If you get a chance, I'd appreciate your looking over http://misc.thirdcontact.com/MythTV/mythtv-re . . . ofiles.patch since it ended up touching a lot more of the player stuff than I imagined it would (since the settings code gets the list of decoders from the player code). If you have suggestions regarding the 3 comments at top (and if I should handle them differently), they'd be appreciated, too. |
| [01:41:48] | gigem_ (gigem_!~david@host137.12.intrusion.com) has joined #mythtv | |
| [01:46:29] | gigem (gigem!~david@host137.12.intrusion.com) has quit (Ping timeout: 272 seconds) | |
| [01:49:38] | markk_: | sphery: looks fine to me – although you might want to leave the database stuff for a separate commit and combine it with an xvmc 'fix'. I'm planning on replacing the 'allow_libmpeg2' in mythplayer with something more flexible – so leaving that is fine. |
| [01:50:31] | markk_: | libmpeg2 reference in videooutput_null will be irrelevant – as there will now never be a libmpeg2 decoder. |
| [01:51:21] | markk_: | the list of allowed decoders will not have libmpeg2 added in privatedecoder_mpeg2 – not sure on reflection whether that will impact lossless transcode. |
| [01:54:54] | sphery: | I ran a test lossless transcode and it seemed to work fine. |
| [01:55:11] | sphery: | I can remove the libmpeg2 stuff from videooutput_null if you like, too |
| [01:56:00] | sphery: | I just assumed that the transcoder was using videooutput_null with libmpeg2--though it may just be direct libmpeg2 calls... |
| [01:57:46] | markk_: | sphery: try removing everything – incl. videooutput_null and privatedecoder_mpeg2 – I suspect lossless transcode will still work. I think it accesses the library directly |
| [01:58:09] | sphery: | like remove the whole privatedecoder_mpeg2.cpp/h? |
| [01:58:36] | sphery: | that would be a nice change if it works |
| [02:00:06] | kormoc is now known as kormoc_afk | |
| [02:45:17] | holomntn (holomntn!~Joe@71-93-231-1.dhcp.mdfd.or.charter.com) has quit (Read error: Connection reset by peer) | |
| [03:10:05] | elmojo: | so is it best to do a clone of master and then git branch fixes/0.24? or do them entirely separate? |
| [03:10:53] | markk_: | elmojo: I just 'git switch' |
| [03:11:04] | elmojo: | ah, I'll go read about it |
| [03:11:13] | markk_: | anyone know why trac is so sloooow at the moment? |
| [03:11:54] | Beirdo: | timeline is always slow unless you turn off the commits. A known issue with the trac git plugin |
| [03:12:21] | Beirdo: | normally, one would clone once, then git checkout fixes/0.24 |
| [03:12:35] | Beirdo: | git switch I think is pretty similar |
| [03:13:00] | Beirdo: | or actually, git switch would be a local alias, it looks like |
| [03:13:27] | Beirdo: | doesn't exist on any of my boxes |
| [03:15:16] | elmojo: | Beirdo: if you clone once and then git check fixes/0.24 does it lose any changes on the master? |
| [03:15:25] | elmojo: | err, checkou |
| [03:15:26] | elmojo: | t |
| [03:15:38] | Beirdo: | nope |
| [03:15:58] | Beirdo: | although, if you haven't committed... your changes will be then against the other branch |
| [03:16:26] | Beirdo: | if you commit your changes (locally), you can switch branches at will |
| [03:17:02] | elmojo: | ah... so if I don't commit and then checkout another branch it applies the changes to the new branch? |
| [03:17:15] | elmojo: | what if it doesn't apply cleanly |
| [03:18:06] | Beirdo: | then it will scream loudly, I would imagine. I forget. i've done it before by mistake |
| [03:18:13] | iamlindoro: | Are commit messages dead/queued ATM? |
| [03:18:19] | Beirdo: | it may not let you checkout. |
| [03:18:21] | elmojo: | and another question... if I do a local commit does git diff still show the differences? |
| [03:18:29] | Beirdo: | not to my knowledge, iamlindoro |
| [03:18:33] | iamlindoro: | Nothing I'm pushing is coming through, and I think there was another change a bit ago I got nothing for |
| [03:18:40] | Beirdo: | one sec |
| [03:21:00] | elmojo: | one issue with git switching is that if you've compiled on master and then switch to a branch you have to do a complete recompile |
| [03:21:10] | sphery: | elmojo: also, check out git-new-workdir in git contrib--sounds like what you may be wanting |
| [03:22:01] | elmojo: | sphery: "git contrib"? |
| [03:22:24] | sphery: | contrib directory of the git source distribution... might be installed on your system by your packages, though |
| [03:22:38] | elmojo: | ah, gotcha... thanks |
| [03:23:58] | Beirdo: | iamlindoro: not seeing any errors in logs |
| [03:24:30] | iamlindoro: | Hmm... no commit messages from the last three commits, 11, 13, and 17 minutes ago |
| [03:24:35] | Beirdo: | not seeing the messages either |
| [03:24:39] | Beirdo: | hmmm |
| [03:25:08] | iamlindoro: | looks like the last one I got was from 12:41ish |
| [03:26:01] | sphery: | markk_: Beautiful plan! Removing PrivateDecoderMPEG2 completely worked great (once I figured out some libs ugliness--mythtranscode wasn't set up right and was leeching off libmythtv's use of libmythmpeg2). Test lossless transcode succeeded, too. New patch at same location if you want to look it over before I commit/push: http://misc.thirdcontact.com/MythTV/mythtv-re . . . ofiles.patch |
| [03:26:46] | Beirdo: | blarf. fixing it |
| [03:26:48] | iamlindoro: | Beirdo, Mark's from a bit ago just popped through-- just some major queue maybe? |
| [03:27:00] | iamlindoro: | ah, here's the rest... some dam you unstopped ;) |
| [03:27:01] | Beirdo: | IK, the test hook worked |
| [03:27:17] | Beirdo: | which resends the last 3 |
| [03:27:25] | Beirdo: | which happens to match the number we ate |
| [03:27:52] | Beirdo: | missed { } |
| [03:27:56] | Beirdo: | argh. |
| [03:28:01] | Beirdo: | good catch |
| [03:31:14] | markk_: | sphery: are you deleting privatedecoder_mpeg2.cpp/h ? |
| [03:31:45] | sphery: | markk_: I think so... I didn't include the removal in the patch, but I'm not using it for anything, now |
| [03:32:00] | sphery: | planned to just git rm it (or whatever the git syntax for that is :) |
| [03:33:05] | markk_: | markk: go for it:) |
| [03:40:15] | sphery: | btw, any Qt pro guys around who can verify my programs/mythtranscode/mythtranscode.pro changes at the bottom of http://misc.thirdcontact.com/MythTV/mythtv-re . . . ofiles.patch ? They're basically copied out of libmythtv.pro (with path modifications). |
| [03:52:17] | kormoc_afk is now known as kormoc | |
| [03:55:43] | gkeen316 (gkeen316!~gkeen316@d75-156-147-11.abhsia.telus.net) has joined #mythtv | |
| [04:34:13] | sphery: | markk_: I'd be happy to do the DB update for XvMC along with the libmpeg2 update, but I need to know how to handle it. Should I just change decoder to ffmpeg and renderer to xv-blit in any profile using XvMC? |
| [04:42:42] | TheWarden (TheWarden!~chatzilla@68-69-209-81.sktn.hsdb.sasknet.sk.ca) has joined #mythtv | |
| [04:42:57] | TheWarden (TheWarden!~chatzilla@68-69-209-81.sktn.hsdb.sasknet.sk.ca) has left #mythtv () | |
| [04:43:24] | ** iamlindoro cheers the death of libmpeg2 ;) ** | |
| [04:46:59] | superm1: | Beirdo, how about keeping the generic bootstrap script in the packaging branch? then you figure it can either be called with no arguments to set up checkouts of everything nicely or with arguments to shell out to the different scripts that spit out packages |
| [04:47:30] | superm1: | then the howto at the front of code.mythtv.org / svn.mythtv.org just says, branch packaging branch and run bootstrap |
| [04:51:25] | Beirdo: | superm1: hmm, sounds reasonable to me right now, but I'm stuck at work at 9pm, so my brain is starting to slow down |
| [04:51:42] | ** superm1 hands Beirdo a beer ** | |
| [04:51:47] | superm1: | that aught to speed it up and get you out of work :) |
| [04:51:59] | Beirdo: | hehe, got scotch should I feel like it |
| [04:55:32] | markk_: | sphery: ffmpeg/xv-blit seems to be the obvious alternative. |
| [05:00:59] | sphery: | markk_: sounds good... I'll work that up soon. |
| [05:01:13] | sphery: | thanks |
| [05:03:13] | iamlindoro: | If we're doing a forced conversion, we could make it to the GL renderer and get more eyes on it-- not necessarily the best idea, just floating it |
| [05:08:07] | markk_: | 99% of people still on xvmc will be on old nvidia or VIA gpus – opengl video won't generally be a working option. |
| [05:09:47] | iamlindoro: | Ah, yeah, that's a good point |
| [05:09:58] | iamlindoro: | didn't think about that |
| [05:10:23] | iamlindoro: | So we can't do it to get rid of users who still try to use a VIA in .25? ;) |
| [05:41:48] | gkeen316 (gkeen316!~gkeen316@d75-156-147-11.abhsia.telus.net) has quit (Ping timeout: 240 seconds) | |
| [06:04:52] | kenni (kenni!~kenni@pfsense.dhcp.pop.k-net.dk) has quit (Ping timeout: 250 seconds) | |
| [06:20:32] | carmony (carmony!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has quit (Quit: carmony) | |
| [06:30:50] | kenni (kenni!~kenni@pfsense.dhcp.pop.k-net.dk) has joined #mythtv | |
| [07:12:43] | xris: | I wonder if redhat ever decided to stop supporting via in their x86 packages. probably not. they still say i386. |
| [07:27:29] | ** jya Can't stand Udo's constant reference to himself as "we" ** | |
| [07:29:07] | wagnerrp: | its the clinical we |
| [07:29:12] | wagnerrp: | hes got multiple personalities in there |
| [07:36:44] | jya: | :) probably |
| [07:47:26] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has joined #mythtv | |
| [07:50:39] | Beirdo: | or the royal we... he thinks he's the king |
| [08:02:08] | leprechau (leprechau!leprechau@c-98-240-50-163.hsd1.tn.comcast.net) has quit (Ping timeout: 240 seconds) | |
| [08:02:20] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has quit (Ping timeout: 245 seconds) | |
| [08:10:01] | m4xx (m4xx!~spooky@c-76-19-95-158.hsd1.ct.comcast.net) has joined #mythtv | |
| [08:51:18] | jya: | damn.... what a dumb mistake... While(blah) { int frames = NewValue } isn't initialised in each loop.. doh ! |
| [08:53:40] | map7_ (map7_!~map7@ppp118-209-4-157.lns20.mel4.internode.on.net) has joined #mythtv | |
| [08:59:03] | wagnerrp: | xris, kormoc: around? |
| [08:59:41] | knightr (knightr!~knightr@69-165-170-178.dsl.teksavvy.com) has quit (Ping timeout: 272 seconds) | |
| [09:00:12] | xris: | barely |
| [09:00:42] | wagnerrp: | mind looking over some php i want to stuff onto the website? |
| [09:01:06] | xris: | can it wait until tomorrow? |
| [09:01:13] | wagnerrp: | sure |
| [09:01:31] | xris: | brain will work better then. (until the dentist shoots me up with novacaine after lunch) |
| [09:02:08] | wagnerrp: | just some basic application to redirect svn revisions to github hashes |
| [09:02:16] | wagnerrp: | to use with the old release notes on the wiki |
| [09:02:35] | wagnerrp: | looking for a once over by someone who does this professionally |
| [09:02:42] | xris: | ah, cool |
| [09:02:50] | xris: | for trac? |
| [09:03:05] | ** xris does perl and ruby professionally these days ** | |
| [09:03:10] | xris: | PHP is "uncool" heh. |
| [09:03:42] | xris: | anyway, need to sleep now... |
| [09:03:46] | wagnerrp: | for all the existing changeset entries on these pages... http://mythtv.org/wiki/Release_Notes_-_0.24 |
| [09:04:00] | wagnerrp: | how about... someone who does web pages professionally, and knows what to look for security wise |
| [09:04:27] | wagnerrp: | anyway... http://www.wagnerrp.com/commitlog/svn/ |
| [09:04:34] | xris: | heh |
| [09:04:49] | wagnerrp: | ill tar it up and put it somewhere on the server |
| [09:05:35] | xris: | check out /opt/svn/www from the new server |
| [09:05:50] | xris: | unless you don't want it to live on www |
| [09:05:57] | xris: | guess it could live on the code vhost |
| [09:07:19] | xris: | anyway... tomorrow. |
| [09:07:23] | xris: | afk for now. |
| [09:07:26] | wagnerrp: | ok, thanks |
| [09:20:22] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has quit (Remote host closed the connection) | |
| [09:21:59] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has joined #mythtv | |
| [09:31:58] | wagnerrp: | ok xris (or kormoc if you get there first), its in /opt/tmp for now, and as mentioned http://www.wagnerrp.com/commitlog/svn is a working version of it |
| [09:56:23] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has quit (Quit: Body blow! Body blow!) | |
| [10:11:54] | stuartm: | de7acc4ef – seems like a regression to me, what's the concern, that people might accidentally click delete and then accidentally select OK in the confirmation? |
| [12:06:40] | map7_ (map7_!~map7@ppp118-209-4-157.lns20.mel4.internode.on.net) has quit (Ping timeout: 276 seconds) | |
| [12:09:03] | knightr (knightr!~knightr@69-165-170-178.dsl.teksavvy.com) has joined #mythtv | |
| [12:09:18] | jarle (jarle!~jarle@70.84-234-133.customer.lyse.net) has quit (Remote host closed the connection) | |
| [12:14:46] | jarle (jarle!~jarle@70.84-234-133.customer.lyse.net) has joined #mythtv | |
| [12:15:01] | jamesba_ (jamesba_!~jamesba@gateb.kw.bbc.co.uk) has joined #mythtv | |
| [12:15:07] | jamesba (jamesba!~jamesba@gateb.kw.bbc.co.uk) has quit (Remote host closed the connection) | |
| [12:42:02] | gigem (gigem!~david@host137.12.intrusion.com) has joined #mythtv | |
| [12:46:08] | gigem_ (gigem_!~david@host137.12.intrusion.com) has quit (Ping timeout: 250 seconds) | |
| [13:06:13] | MaverickTech (MaverickTech!~MaverickT@124-149-187-106.dyn.iinet.net.au) has joined #mythtv | |
| [13:16:09] | Dave123-road (Dave123-road!~dave@cpe-74-74-222-96.rochester.res.rr.com) has joined #mythtv | |
| [13:23:10] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has quit (Ping timeout: 245 seconds) | |
| [13:24:13] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has joined #mythtv | |
| [13:36:19] | pheld (pheld!~heldal@cl-5.osl-01.no.sixxs.net) has quit (Quit: Leaving.) | |
| [13:49:45] | kurre (kurre!~tomimo@xdsl-83-150-88-111.nebulazone.fi) has quit (Ping timeout: 272 seconds) | |
| [13:58:21] | kurre (kurre!~tomimo@xdsl-83-150-88-111.nebulazone.fi) has joined #mythtv | |
| [13:59:07] | caelor (caelor!~caelor@93-97-184-87.zone5.bethere.co.uk) has quit (Ping timeout: 240 seconds) | |
| [14:00:39] | jya: | I'm a bit confused for this change: https://github.com/MythTV/mythtv/commit/ba0e1 . . . 7907169c1f34 |
| [14:00:56] | jya: | this is the commit log I used for fixes/0.24 |
| [14:01:15] | jya: | yet, I see this on master.. |
| [14:01:22] | jya: | or am I missing something? |
| [14:04:15] | jya: | it does have the git-svn-id that it was applied on a branch, but it definitely looks like the history is in master since the switch to git |
| [14:04:26] | jya: | https://github.com/MythTV/mythtv/tree/master/ . . . ibmyth/audio |
| [14:04:43] | jya: | notice all the backports bit, those are in 0.24-fixes only |
| [14:04:57] | MaverickTech (MaverickTech!~MaverickT@124-149-187-106.dyn.iinet.net.au) has quit (Ping timeout: 272 seconds) | |
| [14:05:22] | danielk22 (danielk22!~danielk@96.57.9.142) has quit (Quit: Leaving.) | |
| [14:11:43] | jya: | I'm now very confused with git.. I did a git push, and instead of seeing my current unpushed changes, it pushed one commit of the newaudio branch.. wtf? |
| [14:15:30] | stuarta: | jya: btw. do you want to take a look at 8740? it's a result of some of your earlier changes that use SSE3 instructions in timestretch |
| [14:15:57] | stuarta: | s/timestretch/libsoundtouch |
| [14:16:10] | jya: | stuarta: I never wrote any sse3 code for libsoundtouch |
| [14:16:19] | jya: | janne did. |
| [14:16:54] | ** stuarta checks something ** | |
| [14:17:30] | jya: | but where I'm confused, is that it calls the SSE3 code which has been clearly noted as SSE3, even thouugh his machine doesn't support SSE3 |
| [14:17:34] | kc (kc!~Casper@unaffiliated/kc) has joined #mythtv | |
| [14:18:18] | stuarta: | i reported it originally |
| [14:18:45] | jya: | yes, ad Janne changed it, by clearly labelling each function |
| [14:20:19] | jya: | my understanding is that while there may still be some SSE3 code in the SSE2 one |
| [14:20:58] | jya: | the SSE3 code identified as such should never be called unless the machine supports SSE3 |
| [14:21:15] | jya: | can have a look later after I find the reason for this bug nagging me. |
| [14:21:48] | jya: | it's staring right at my face. spent 2 full days already. I can bypass the bugs, but I have no idea why. |
| [14:22:13] | jya: | been there for a long time, I reverted back all the way from when I merge the hdaudio branch, and it was already there |
| [14:22:33] | stuarta: | apologies, it does look to be committed by him, from foobum originally |
| [14:27:49] | AriX (AriX!~Ari@207.245.119.4) has joined #mythtv | |
| [14:38:56] | j-rod|afk is now known as j-rod | |
| [14:39:29] | jya: | let me check... i'm surprised foobum would do something so obviously wrong.. I think if we can simply prevent running ss3 code, labelled as such when your machine doesn't support it, issue is resolved. There was a problem about sse3 code hidden in sse2 one, but this is not the problem this time |
| [14:40:09] | stuarta: | no, it's definitely running the sse3 code on an sse2 only box |
| [14:40:23] | jya: | that's not what I mean |
| [14:40:41] | jya: | last time, we had SSE3 code in the SSE2-only section |
| [14:40:49] | stuarta: | yes, that's not this |
| [14:40:58] | jya: | this time, the SSE3 code is called even though the machine is SSE2 only |
| [14:41:05] | stuarta: | yes, that's what i said |
| [14:41:28] | jya: | you started your sentence with "no" meaning I wrote something wrong, which I didn't :P |
| [14:41:58] | stuarta: | the no was an agreement with your last sentence |
| [14:42:08] | ** stuarta appears to use the english language in odd ways ** | |
| [14:42:15] | jya: | ahhhh |
| [14:42:22] | danielk22 (danielk22!~danielk@96.57.9.142) has joined #mythtv | |
| [14:44:35] | jya: | where is MM_SSE3 set ? |
| [14:45:14] | jya: | never mind .. |
| [14:47:40] | jya: | looks like mm_support is broken |
| [14:48:02] | jya: | otherwise TDStretchSS3 would have never been called |
| [14:48:18] | carmony (carmony!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has joined #mythtv | |
| [14:49:28] | danielk22: | gigem: stuartm: be careful with git-new-workdir, the workdirs created from one checkout do not automatically point to the same branch.. |
| [14:54:09] | gigem: | danielk22: you can specify the branch on the command line. anyway, my intent is to always create the branch first and then run g-n-w. |
| [14:56:24] | jya: | stuarta: that part was completely rewritten in soundtouch 1.5.0 |
| [14:56:35] | jya: | time to upgrade our copy I guess |
| [14:56:39] | stuarta: | the detection routines? |
| [14:59:19] | danielk22: | stuarta: We used to use soundtouch in integer mode, we now use it in floating point mode, so we are running completely different, and apparently extreemely buggy, soundtouch code. |
| [14:59:37] | stuarta: | excellent... |
| [14:59:44] | jannau: | jya: you did. your SSE2 contained SSE3 instructions |
| [14:59:52] | jannau: | and probably still does |
| [15:00:36] | jya: | which sse2 code ? never touched the code of soundtouch.. only called some existing parts |
| [15:01:26] | jya: | danielk22: may be worth updating the copy of soundtouch, our copy is very old |
| [15:02:06] | jya: | and looking in the latest 1.5.0, all the SSE bits have been rewritten |
| [15:02:43] | jannau: | jya: you or someone else rewrote the integer asm to float in the mythtv-hdaudio branch |
| [15:02:57] | danielk22: | jya: for 0.24-fixes we just want to pull in any fixes.. but yeah for trunk a resync would be good. |
| [15:03:21] | jannau: | I think the asm is mostly our own |
| [15:03:25] | jya: | yes, that's in audiooutpututil.cpp .. in libmyth |
| [15:03:39] | jya: | in the problem at hand |
| [15:03:55] | jya: | the cpu_detect code states that the machine supports SSE3 when it doesn't |
| [15:04:04] | jya: | changing the function alone should be enough |
| [15:04:06] | AriX (AriX!~Ari@207.245.119.4) has quit (Quit: Leaving...) | |
| [15:04:24] | jannau: | jya: I'm speaking about libs/libmythsoundtouch/sse_gcc.cpp |
| [15:05:00] | danielk22: | jya: It should be hard to make it always say the machine does not support SSE3... |
| [15:05:13] | danielk22: | s/should/should not/ |
| [15:05:23] | jya: | there are sse instructions for that :) |
| [15:05:33] | jannau: | and I doubt that mm_support() is broken we would otherwise see many libavcodec crashes |
| [15:05:37] | jya: | what the guy did is check the CPUID and make some assumptions |
| [15:06:00] | jya: | libavcodec is using mm_support from soundtocuh? |
| [15:06:42] | danielk22: | jannau: there is hardly any reason to write SSE3 specific code, ffmpeg devs may have just avoided that altogether. |
| [15:06:47] | jannau: | no, just seeing that there's a copy |
| [15:06:56] | jya: | is it the same version ? |
| [15:07:05] | jannau: | it should |
| [15:07:13] | jannau: | if not it's my fault |
| [15:07:18] | jya: | if not, fix may be even easier.. use the one used by ffmpeg |
| [15:11:29] | jannau: | I think there was a reason why I haven't done that |
| [15:12:50] | jya: | looking at the two |
| [15:12:54] | jya: | they are very similar |
| [15:13:39] | jya: | only seem to differ from the mmx part |
| [15:14:42] | jya: | from the backtrace the guy provided in the ticket, TDStretchSSE3 is called, and TDStretchSSE3 can only be called if the cpu has been detected as supporting sse3 |
| [15:15:06] | jya: | does ffmpeg have much sse3 code ? |
| [15:15:40] | jannau: | probably only audio code. sse3 is only useful for floating point |
| [15:18:21] | jannau: | no, h264, mpeg video, vc1 and vp8 use also SSE3 |
| [15:19:25] | danielk22: | wow.. so if we switch to the ffmpeg mm_support it should fix this problem... |
| [15:20:12] | jya: | danielk22: as far as I can tell, the mm_support for detecting SSE3 is the same for both |
| [15:21:22] | jya: | the soundtouch guy had no shame in putting his copyright on it |
| [15:22:32] | danielk22: | jya: both versions may very well be forks of some explicitly public domain code.. |
| [15:22:59] | ** jannau doubts that ** | |
| [15:23:03] | jya: | well, each group put their name of it though |
| [15:23:21] | jannau: | the soundtouch code is clearly a copy from libavcodec |
| [15:24:30] | jya: | What'll I do is compile a little file and send to the reporter and see what mm_support reports |
| [15:27:37] | danielk22: | SoundTouch 1.5.0 does not have a function called mm_support().. it uses detectCPUextensions() ... |
| [15:28:33] | danielk22: | Perhaps we were porting the library to use mm_support() because of problems with detectCPUextensions() and then stopped mid-port? |
| [15:29:24] | danielk22: | Looks like there is also no SSE3 test in the SoundTouch code. |
| [15:29:34] | danielk22: | (upstream I mean) |
| [15:29:35] | Goga777 (Goga777!~Goga777@shpd-95-53-215-170.vologda.ru) has joined #mythtv | |
| [15:29:49] | jannau: | danielk22: I think the asm in our soundtouch copy is our own |
| [15:30:48] | danielk22: | Who wrote it? It is hard to believe someone went through all the work of writing SSE code and forgot about it. |
| [15:32:34] | jya: | foobum wrote a big part |
| [15:32:39] | jya: | (if not all) |
| [15:33:05] | jya: | there were sse code before he made mods though |
| [15:33:09] | jannau: | foobum, see ticket 5890 |
| [15:33:09] | jya: | so someone else did |
| [15:34:04] | jannau: | no, it was added in 64a0f7223b5d03 |
| [15:34:23] | jannau: | by applying a patch from foobum |
| [15:35:05] | danielk22: | gah, I hope we don't have to revert all the foobum code :| |
| [15:35:48] | jannau: | according to the public cpuid information in http://www.cpu-world.com/cgi-bin/CPUID.pl?CPU . . . p;RAW_DATA=1 the mm_support in libmythsoundtouch is not buggy |
| [15:36:34] | jya: | danielk22: I don't think that's the issue here |
| [15:37:34] | jannau: | well, that's the problem with importing all kind of code and allow modifications to it |
| [15:40:00] | Goga777 (Goga777!~Goga777@shpd-95-53-215-170.vologda.ru) has quit (Remote host closed the connection) | |
| [15:41:44] | danielk22: | Upstream does not have SSE3 specific code. It actually doesn't even implement those functions in asm blocks anymore, it uses intrinsics. |
| [15:43:22] | jannau: | it might never had asm |
| [15:43:36] | danielk22: | haddps/haddpd seem to be the main culprits.. I highly doubt using those even affects performance... |
| [15:44:12] | danielk22: | jannau: No it did. It had SSE code. I updated that library a few years back. |
| [15:44:26] | danielk22: | s/few/a number of/ |
| [15:44:28] | jannau: | they were the problem I fixed |
| [15:45:15] | danielk22: | yeah, just looking upstream, they have their old SSE code in the comment at the bottom of sse_optimized.cpp |
| [15:46:41] | jya: | http://mythtv.pastebin.com/VvA5VrK3 |
| [15:48:04] | jya: | hum. something isn't right |
| [15:48:17] | jya: | too late anyway.. will look into it tomorrow.. good night everyone |
| [15:59:24] | jannau: | jya: missing return in mm_support1 |
| [16:01:01] | jannau: | jya: http://mythtv.pastebin.com/i0GTiSxT |
| [16:01:15] | faris_uppercut (faris_uppercut!~faris@78.146.132.140) has joined #mythtv | |
| [16:03:18] | faris_uppercut: | hey, can someone help me out Ive been trying to get mytv card (omicom s2 PCI, or skystar4) working in linux, have been trying for hours but with no luck, Ive got to the point where when I grep -i dvb /var/log/messages I get saa7146: register extension 'dvb' |
| [16:03:34] | stuarta: | you want #linuxtv |
| [16:03:53] | faris_uppercut: | ah sorry, cheers |
| [16:16:57] | stoffel (stoffel!~quassel@p57B4CE36.dip.t-dialin.net) has joined #mythtv | |
| [16:17:52] | danielk22 (danielk22!~danielk@96.57.9.142) has quit (Quit: Leaving.) | |
| [16:28:07] | caelor (caelor!~caelor@93-97-184-87.zone5.bethere.co.uk) has joined #mythtv | |
| [16:32:46] | caelor (caelor!~caelor@93-97-184-87.zone5.bethere.co.uk) has quit (Ping timeout: 255 seconds) | |
| [16:34:38] | iamlindoro: | stuartm: I have gone back and forth on the Video delete option a number of times myself-- the people who let their kids run MythVideo are the ones who seem most concerned with it, but to be completely honest I am almost resolved in my mind to do a mythvideo UI rewrite from scratch that treats Movies and Television distinctly, possibly moving administrative functions like delete, reset metadata, remove from library, etc. into a rethought edit |
| [16:34:38] | iamlindoro: | metadata screen |
| [16:35:26] | caelor (caelor!~caelor@93-97-184-87.zone5.bethere.co.uk) has joined #mythtv | |
| [16:36:34] | iamlindoro: | stuartm: Mostly I want themers to be able to display TV and Movies differently, and the only ways I can think of to adapt the current videodialog to it are ugly, nasty hacks-- I'm currently much more fond of splitting it out into Media Library->Movies and Media Library->TV Shows (as most other media center applications do) |
| [16:37:13] | stuartm: | iamlindoro: well my problem with it, aside from making it harder to delete videos from my collection, is that it's not really consistent with recordings – IMHO recordings are more important but we don't hide or restrict the delete option there so why are videos any different? |
| [16:38:12] | iamlindoro: | I daresay reacquiring/ripping/etc. a video is a much bigger pain in the ass |
| [16:39:01] | iamlindoro: | But anyway, point is I am on the verge of a rethink about how all of this works, I believe, and that I am not sure I agree that MythVideo and the PBB should be 100% consistent just for the sake of doing it |
| [16:40:11] | iamlindoro: | I think Recordings, Movies, and archived Television Shows should be treated equally, but that doesn't necessarily mean that they all lend themselves to the same UI |
| [16:47:57] | stuartm: | in many cases a recording is more valuable, at least in the UK, because it may never be repeated, in contrast re-ripping it a minor irritation |
| [16:48:07] | stuartm: | is |
| [16:48:32] | stuarta: | would it not make sense to tie it into the multi user security level support we don't have? |
| [16:48:43] | stuarta: | if you don't set it up, allow delete |
| [16:48:58] | stuarta: | if you do, then it can be available at various level |
| [16:49:42] | iamlindoro: | Also, ponies |
| [16:49:46] | iamlindoro: | ;) |
| [16:49:59] | iamlindoro: | But in seriousness, yes, I'd be fine with it being a user-based thing |
| [16:50:08] | stuartm: | iamlindoro: I don't think they should share the same UI either, but they shouldn't be developed in isolation either, in the areas where they have commonality the behaviour/options should be identical IMHO |
| [16:50:44] | stuartm: | stuarta: fwiw that was what I was going to suggest for this, but I forgot |
| [16:51:18] | iamlindoro: | stuartm: I like stuarta's suggestion, and I'm just playing with different ideas and seeing what works and what doesn't... I'm not married to anything. I just know I don't like how it all works now and I'm starting to formulate a plan to make it better |
| [16:51:58] | stuartm: | basically allow deletion to be disabled for user groups, this makes perfect sense for the kiosk/hotel/school setup, but if done that way then disabling delete should apply everything equally e.g. video/music/gallery/recordings |
| [16:52:13] | stuarta: | agreed |
| [16:53:59] | stuartm: | and fwiw, I will be committing the foundation for multi-user in time for 0.25, it's all in my head right now but it's silly easy |
| [16:58:23] | iamlindoro: | stuartm: Anyway, just wanted you to feel that I share your concerns, but also wanted you to have an appreciation for where I'm hoping to go-- Some of last night is stuff that was just obvious and necessary, some was just "playing" to see how things feel, Delete move included |
| [16:58:56] | iamlindoro: | The ambitious part of me hopes for a MythVideo rewrite to be a Christmastime Project, though it could take quite a lot longer, I just don't know |
| [17:03:17] | gigem: | stuartm: how does your silly easy foundation intend to handle different users wanting to record the same program? it would be a waste to tie up multiple tuners and write to multiple files. so use one tuner and write to one file then, but what if the users choose different recording options? should users be able to see other users' recordings/schedules? what do you tell a user when their program can't be recorded because of conflicts, but you can' |
| [17:03:18] | gigem: | t tell them what programs will be recorded instead? not saying i have the answers, but these are just some of the things i've pondered myself while thinking about multi-user support. |
| [17:03:59] | carmony (carmony!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has quit (Quit: carmony) | |
| [17:07:47] | iamlindoro: | stuartm: http://svn.mythtv.org/trac/wiki/TaskMythVideoRewrite Please add thoughts/comments/suggestions to the page. I'd like to really think it through before I start work, and would value your input |
| [17:08:21] | stuartm: | gigem: that's the advanced stuff, that's well beyond what I'm talking about atm |
| [17:08:55] | stuartm: | that's what you want from multi-user, but there are many other things that don't need that question answering at this stage |
| [17:11:15] | gigem: | yes, that's the stuff i could use right now. the simple stuff doesn't interest me too much. i do want to make sure, though, that the hard stuff is accounted for in any multi-user support framework. |
| [17:12:03] | stuartm: | I'm talking about the framework for creating users, groups, changing between users, administration and hooking functionality/settings into those classes |
| [17:15:31] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has joined #mythtv | |
| [17:15:37] | stuartm: | gigem: it will be a pretty open-ended framework, the idea being that plugin authors and core code can register their own feature sets and hook into user-related events – I think this is the only way we're going to get multi-user started, starting with the hard tasks is the quickest way to kill the project dead |
| [17:17:04] | stuartm: | iirc the GSoC multi-user project got bogged down in immediately porting all the functionality of the frontend etc to make use of multi-user, I'm going in another direction, adding the framework and then we can hook in features/functionality as time allows |
| [17:18:41] | stuartm: | gigem: long term I'd love to see shared tuner support etc, but I don't have the answer to those questions either, I've given it plenty of thought but it's not simple |
| [17:20:13] | wagnerrp: | stuartm: will you be doing anything security-wise to enforce those restrictions? or just rely on the software doing the right thing? |
| [17:20:45] | wagnerrp: | im just thinking about such kiosk/hotel/school setups, its trivial to break into mythtv currently |
| [17:21:50] | gigem: | i know it's not simple, that's why i haven't started on it yet. :) i think it would help if you first defined some of the use cases you intend to support. i suspect multiple users using the same frontned with their own settings/preferences is your primary one. as noted already the main one i want is multiple users mostly with their own, dedicated frontend, but sharing all backend resources. |
| [17:22:34] | stuartm: | wagnerrp: there will be a reasonable amount of security around it, but I won't be changing the assumption that access to the hardware or database are the users problem |
| [17:23:10] | wagnerrp: | i guess realistically, theres not a whole lot that can be done until we remove the external database |
| [17:23:40] | carmony (carmony!~justin@75-162-250-143.slkc.qwest.net) has joined #mythtv | |
| [17:25:57] | stuartm: | wagnerrp: aye, securing the network protocols, database etc are all worthy goals but they aren't really directly connected to this project, if someone adds authentication to the external protocols then it can be hooked upto multi-user but multi-user isn't going to start adding that stuff |
| [17:26:56] | stuartm: | gigem: the latter is what I'd personally love to see, but the former is where I'm going to start – it's what most people want from multi-user, it's easily achieved and it lays the foundations for the rest |
| [17:28:06] | jamesba_ (jamesba_!~jamesba@gateb.kw.bbc.co.uk) has quit (Quit: Leaving) | |
| [17:29:20] | stuartm: | for most people multi-user is about locking down the frontend's in the kids bedrooms, that means preventing them from viewing adult videos and recordings, preventing them scheduling recordings completely or restricting them to certain channels, allowing frontends to be used only between certain hours or for X hours a day etc. |
| [17:29:34] | gigem: | as long as the foundation allows for more advanced uses, i'll be happy. i just don't want to see something done that is overly simplistic and has to be completely overhauled later. |
| [17:30:46] | danielk22 (danielk22!~danielk@96.57.9.142) has joined #mythtv | |
| [17:34:43] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has quit (Ping timeout: 240 seconds) | |
| [17:38:15] | stuartm: | I'm hoping that if I get the API done that others will start to use it, I'm not about to start another mythui scale port/re-write |
| [17:41:44] | gigem_ (gigem_!~david@host137.12.intrusion.com) has joined #mythtv | |
| [17:42:06] | faris_uppercut (faris_uppercut!~faris@78.146.132.140) has quit (Read error: Connection reset by peer) | |
| [17:44:53] | stuarta: | jannau: that test_cpuid program doesn't compile here |
| [17:44:59] | ** stuarta pokes it a bit ** | |
| [17:46:04] | gigem (gigem!~david@host137.12.intrusion.com) has quit (Ping timeout: 260 seconds) | |
| [17:46:14] | gigem_ is now known as gigem | |
| [17:47:56] | jannau: | stuarta: add -DARCH_X86_64 or -m32 if you're on x86_64 |
| [17:48:11] | stuarta: | one box is a p4 as per ticket reporter |
| [17:48:16] | stuarta: | er, that was me |
| [17:48:21] | stuarta: | ticket commeter |
| [17:49:00] | stuarta: | still moaning |
| [17:49:09] | stuarta: | test_cpuid.c:10: error: expected â=â, â,â, â;â, âasmâ or â__attribute__â before âx86_regâ |
| [17:49:17] | stuarta: | or on line 14 for 32 bit arch |
| [17:50:43] | stuarta: | gcc 4.4.5 in both cases |
| [17:53:11] | jannau: | stuarta: try again |
| [17:53:32] | jannau: | may need a -std=c99 |
| [17:53:59] | stuarta: | both compile |
| [17:54:25] | jannau: | grrr, where is the delete attachment in trac? |
| [17:54:57] | jannau: | ah, it has to be displayed |
| [17:56:37] | stuarta: | added my results to ticket |
| [17:56:41] | ** stuarta heads off home ** | |
| [17:59:11] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has joined #mythtv | |
| [18:02:29] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has joined #mythtv | |
| [18:22:50] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has joined #mythtv | |
| [18:24:36] | jannau: | argh, I see the problem now. MM_SSE3 has the same value as MM_SSE2 |
| [18:25:59] | mrand: | bug, or intentional for some reason? |
| [18:26:44] | jannau: | copy and paste error |
| [18:26:46] | iamlindoro: | Beirdo: Do we have any plans to fix the post-commit ticket closing hooks? I think we have closed a number of tickets and forgotten to manually go through and close them in trac |
| [18:34:30] | xris: | wagnerrp: you ever consider just linking the svn stuff directly to fisheye? |
| [18:35:04] | wagnerrp: | fisheye can take those revision numbers? |
| [18:35:05] | xris: | http://code.mythtv.org/fisheye/browse/svn-mythtv |
| [18:35:10] | xris: | I imported the svn repo |
| [18:36:03] | xris: | just depends on whether you want to link to an archive or to something more applicable to current development |
| [18:37:10] | wagnerrp: | actually, i was more looking for something like http://code.mythtv.org/fisheye/changelog/svn- . . . revision> |
| [18:37:35] | stoffel (stoffel!~quassel@p57B4CE36.dip.t-dialin.net) has quit (Remote host closed the connection) | |
| [18:37:48] | wagnerrp: | didnt even know that was an option |
| [18:38:58] | wagnerrp: | although to be honest, its /really/ slow |
| [18:42:07] | xris: | only the first time |
| [18:42:12] | xris: | then it creates a disk cache |
| [18:42:47] | xris: | http://code.mythtv.org/fisheye/changelog/svn-mythtv/?cs=27420 |
| [18:43:03] | danielk22: | doh! at least that should be easy to fix |
| [18:43:05] | xris: | don't even need the trunk part of the path (in fact probably better if not) |
| [18:43:18] | wagnerrp: | yeah, noticed that |
| [18:43:57] | xris: | anyway, take your pick. I've actually considered going back through the svn commits and ammending the commit messages to point at the git sha |
| [18:44:24] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has quit (Remote host closed the connection) | |
| [18:44:30] | wagnerrp: | amending them where? |
| [18:44:39] | xris: | svn allows you to edit commit messages |
| [18:44:45] | xris: | would edit the read-only repo |
| [18:44:54] | xris: | actually... that'd solve a lot of issues in trac, too |
| [18:44:55] | wagnerrp: | this was specifically to solve the current problems on the wiki, with the release not pages |
| [18:45:07] | xris: | yeah, I know. different reasons |
| [18:45:20] | wagnerrp: | ok |
| [18:45:30] | xris: | my interest is for trac, and just general linkiness |
| [18:46:52] | wagnerrp: | well as mentioned in the other module folder on there, the other (not yet written) half of this is for a cleaner download interface from github than using hashes |
| [18:47:28] | wagnerrp: | kormoc and i want to change the gentoo ebuilds to just use a timestamp to identify the revision |
| [18:47:44] | wagnerrp: | as a cleaner method than carrying around a large hash (and a timestamp to ensure linearity) |
| [18:48:50] | wagnerrp: | i was actually working on that currently |
| [18:50:20] | danielk22: | markk_: I'm seeing a very bright green screen with XVideo output in LiveTV before the signal comes in. I'm assuming this has something do with the recent player changes, but it could be a driver change (I upgraded to the new series). |
| [18:50:39] | wagnerrp: | as for this+github or jira, i think that more depends on what we prefer to use as the code browser in the future |
| [18:50:54] | danielk22: | markk_: Just a heads up, I haven't really verified where the regression is coming from. |
| [18:50:56] | wagnerrp: | i have no real preference either way |
| [18:54:23] | Beirdo: | iamlindoro: yeah, that needs to be fixed. I may need wagnerrp's python-fu to help with that, but it really does need fixing ASAP |
| [18:55:30] | stuartm: | iamlindoro, paul-h: mythbrowser just flatly refuses to link libmythtv :) |
| [18:57:15] | iamlindoro: | stuartm: hrm... I haven't had any troubles linking. I wonder what I'm doing differently. Just made distclean and made again without issue |
| [18:57:37] | stuartm: | mythplugins/programs-libs.pro needs to include LIBS += -lmythtv-$$LIBVERSION |
| [19:00:12] | stuartm: | iamlindoro: I can make that change if you don't |
| [19:00:22] | iamlindoro: | Sure, go for it, thanks |
| [19:24:49] | sphery: | danielk22: I'm doing a DB update to clean up old playback profiles (libmpeg2->ffmpeg, xvmc->ffmpeg, xvmc-blit->xv-blit), and noticed that we ia44blend (which seems to have been an XvMC OSD renderer) is gone. What do you think is an appropriate replacement OSD renderer? (FWIW, list of default pre-change profiles + my one custom profile is at http://mythtv.pastebin.com/K9Xyh5P9 ). |
| [19:25:43] | danielk22: | sphery, are you switching XvMC users to XVideo ? |
| [19:26:02] | sphery: | yeah, ffmpeg/xv-blit |
| [19:26:09] | danielk22: | In that case softblend.. |
| [19:26:32] | sphery: | ok--wasn't sure if we should do chromakey for "performance" reasons (even though it's not likely what people wanted). Thanks. |
| [19:28:04] | danielk22: | If they are watching SD material with XvMC XVideo + softblend will probably work and look best. If they are watching HD material they really need to stick with 0.24 or upgrade their hardware. |
| [19:28:22] | sphery: | yeah, good point |
| [19:29:22] | sphery: | bobdeint and onefield are fine with xv-blit, right? |
| [19:29:27] | danielk22: | sphery: Do you know why it seems to select one of the CPU profiles on a new install? It really should pick "Normal" |
| [19:29:37] | danielk22: | sphery: yes |
| [19:30:39] | danielk22: | although linearblend is probably a better choice. bobdeint and onefield look bad with SD material. |
| [19:30:54] | sphery: | danielk22: yeah, it's a bug in the way we're creating the settings widget--I started looking at it, figured out what's happening (basically we end up with the one that's first in the list), but decided it wasn't worth the time to fix it since we were planning a settings rewrite (and, at the time I looked, I didn't know it would be backend settings first, then frontend settings possibly long after). |
| [19:31:53] | sphery: | danielk22: BTW, in the XvMC removal, markk_ just removed CPU+ and CPU-- (since after XvMC was gone--and especially when libmpeg2 is also removed--they weren't anything really different) |
| [19:31:53] | danielk22: | sphery: I do hope to reuse the mythtv-setup stuff for the frontend settings, but yes it will be a while before that happens. |
| [19:32:17] | sphery: | so, one thing we /could/ do is just remove CPU++, too, then the "default" would be whatever comes next alphabetically |
| [19:33:10] | danielk22: | True... But High Quality would probably stress most systems... |
| [19:33:12] | sphery: | though that may be High Quality... checkign to see if it's alpha or different order |
| [19:34:19] | elmojo: | with git, if I make local changes and want to revert then what is the best method... I tried git reset but it doesn't work like I thought it would |
| [19:34:21] | danielk22: | sphery will the DB update also deal with people's custom profiles with xvmc in them? |
| [19:34:40] | sphery: | yeah, it's a blanket change |
| [19:35:05] | danielk22: | great |
| [19:35:39] | danielk22: | I understand those people will probably need to set things up again, I'm more concerned about the schema remaining valid. |
| [19:36:00] | sphery: | http://misc.thirdcontact.com/MythTV/mythtv-db . . . bmpeg2.patch is the patch--quite simple so far (though changing the deinterlacers would be more complex since I'd have to only do it for the formerly-using-XvMC ones) |
| [19:36:04] | stuartm: | elmojo: "git checkout path/to/file" |
| [19:36:24] | stuartm: | elmojo: . may be used to specify the working directory (recursive) |
| [19:36:25] | danielk22: | hmm, didn't we already removed the ivtv renderer? |
| [19:36:37] | danielk22: | oh, right CPU-- is gone.. |
| [19:36:49] | sphery: | danielk22: and since markk removed the only 2 example playback profile groups using XvMC, I'm thinking I'll just let users fix their custom profile deinterlacers themselves. Sound good? |
| [19:37:01] | danielk22: | yep |
| [19:37:09] | sphery: | cool, makes it a nice simple update |
| [19:37:12] | stuartm: | elmojo: git reset resets committed local changes, so it does a bit more than checkout but is more dangerous as a result |
| [19:37:43] | elmojo: | stuartm: thanks... the '.' was required |
| [19:38:19] | danielk22: | sphery: can you drop ivtv as well.. I should have been done it when I killed PVR-350 output (assuming it was me that did it :) |
| [19:38:20] | elmojo: | so 'git reset' does nothing and 'git reset .' applies to everyhing recursively |
| [19:38:53] | sphery: | danielk22: drop it from profiles, you mean? There's no actual code for it left, right? |
| [19:39:13] | danielk22: | Yeah, just drop it from the profiles. The code is already gone. |
| [19:40:10] | jannau: | elmojo: git reset clears the index |
| [19:40:15] | sphery: | so ivtv decoder to ffmpeg and video renderer to xv-blit and osd renderer to softblend? seems we'd need to add deinterlacers--at that point, is it best to just remove the actual profile from the group? |
| [19:40:48] | sphery: | danielk22: oh, and FWIW, you may have done it already (I'll check before doing it again)--that's a 0.23-fixes DB schema I'm using to see the pre-changes definitions |
| [19:40:53] | carmony (carmony!~justin@75-162-250-143.slkc.qwest.net) has quit (Quit: carmony) | |
| [19:40:54] | danielk22: | sphery: just a straight remove. |
| [19:41:02] | carmony (carmony!~justin@75-162-250-143.slkc.qwest.net) has joined #mythtv | |
| [19:41:04] | sphery: | cool, that will make it easier |
| [19:41:08] | jannau: | elmojo: if you want a pristine index and working copy git reset --hard |
| [19:44:42] | elmojo: | iamlindoro: what was the git equivalent for 'svn up' ... I'm updating the Git cheatsheet on the wiki |
| [19:44:52] | iamlindoro: | pull |
| [19:44:53] | sphery: | git pull |
| [19:44:54] | stuartm: | iamlindoro: git pull |
| [19:45:07] | iamlindoro: | stuartm: I know :) |
| [19:45:14] | stuartm: | just making sure |
| [19:45:16] | carmony (carmony!~justin@75-162-250-143.slkc.qwest.net) has quit (Ping timeout: 245 seconds) | |
| [19:45:23] | iamlindoro: | Heh, but I didn't ask |
| [19:45:43] | stuartm: | you sure? |
| [19:46:07] | danielk22: | markk_: sphery: We should probably switch "High Quality" to use OpenGL rendering before falling back to XVideo.. that should get us more testing of the OpenGL rendering before we eventually drop XVideo. |
| [19:46:22] | iamlindoro: | hey stuartm, do you happen to know the git equivalent of svn up? |
| [19:47:16] | danielk22: | iamlindoro: I think it is: "git commit -a ; git pull" |
| [19:47:28] | iamlindoro: | Heh |
| [19:47:33] | iamlindoro: | It is if you go by the way I did it last night |
| [19:48:03] | jams: | git pull or git fetch & git merge |
| [19:48:28] | stuartm: | actually danielk22's answer is more accurate, since git won't merge incoming changes with local ones so you need to commit them first |
| [19:48:42] | iamlindoro: | jams: lol, we know |
| [19:48:48] | iamlindoro: | jams: I asked facetiously |
| [19:49:07] | jams: | nver mind then, just glanced over and saw the question =) |
| [19:49:08] | iamlindoro: | stuartm: Unfortunately it also means you get the stupid "merged with master" message |
| [19:49:34] | ** jams goes back to work ** | |
| [19:49:57] | iamlindoro: | stuartm: git stash may work, though |
| [19:50:01] | elmojo: | iamlindoro: I'm referring svn up for when you delete a file and want it back |
| [19:50:05] | sphery: | danielk22: the only example profile group that used ivtv was CPU--, which markk_ removed at https://github.com/MythTV/mythtv/commit/252f801#L11R1019 , so I'll just change any custom profiles to use ffmpeg/xv-blit/softblend rather than ivtv |
| [19:50:40] | iamlindoro: | elmojo: git checkout HEAD filename |
| [19:51:25] | danielk22: | sphery: custom ivtv profiles probably already have an ffmpeg/xv-blit/softblend line following ivtv, since ivtv could really only play ivtv recorded videos. |
| [19:51:34] | iamlindoro: | elmojo: for a single file, that is |
| [19:51:37] | elmojo: | iamlindoro: but if you don't want to have to put the filename |
| [19:51:41] | iamlindoro: | elmojo: For all deleted files: git ls-files -d | xargs git checkout -- |
| [19:51:48] | sphery: | danielk22: here's the 0.24 playback profiles: http://mythtv.pastebin.com/fkA6mb71 |
| [19:51:51] | elmojo: | yes that's the one |
| [19:52:24] | stuartm: | iamlindoro: isn't the HEAD bit redundant? |
| [19:52:41] | iamlindoro: | stuartm: That's per the git book |
| [19:53:08] | iamlindoro: | I figure they, like everyone else, know more about git than I |
| [19:53:11] | stuartm: | elmojo: "git checkout ." should do the job |
| [19:53:21] | sphery: | danielk22: so just leave the ivtv in custom profile groups or rip that profile out of the group? |
| [19:53:26] | stuartm: | well it does, I've just tried it |
| [19:53:34] | danielk22: | so I'm in a bit of a bind with git.. I have a local brach called mythtv-rec which was brached of remotes/origin/dkristjansson/mythtv-rec and where I've merged in changes from remote/origin/master, now I want to push those changes to remotes/origin/dkristjansson/mythtv-rec. However.. |
| [19:54:01] | danielk22: | remotes/origin/HEAD points to origin/master now for some unknown reason.. |
| [19:54:27] | carmony_ (carmony_!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has joined #mythtv | |
| [19:54:35] | danielk22: | so if I push I fear I may push the mythtv-rec changes to origin/master rather than the mythtv-rec branch. |
| [19:55:32] | Beirdo: | hmmm |
| [19:55:58] | PointyPumper (PointyPumper!~pintlezz@190.244.73.13) has joined #mythtv | |
| [19:56:04] | Beirdo: | you are still on the mythtv-rec branch locally, right? |
| [19:56:09] | stuartm: | Beirdo: github>trac hook is broken for some reason |
| [19:56:10] | danielk22: | right |
| [19:56:27] | Beirdo: | stuartm: we know. the closes part is borked |
| [19:56:42] | Beirdo: | I was talking to wagnerrp about it a touch earlier |
| [19:57:01] | Beirdo: | one sec |
| [19:57:15] | Beirdo: | as far as I know... |
| [19:57:33] | Beirdo: | git push origin mythtv-rec:dkristjansson/mythtv-rec |
| [19:57:58] | Beirdo: | is what you are looking for. Is j-rod or jannau around to double-check my command line? |
| [19:58:07] | Beirdo: | or xris? :) |
| [19:59:18] | jannau: | danielk22: try first with git push -n |
| [19:59:32] | Beirdo: | ahh, yeah, that is a good idea :) |
| [19:59:41] | Beirdo: | ye olde dry run |
| [19:59:59] | danielk22: | jannau: that was rejected "To prevent you from losing history" |
| [20:00:20] | jwhite__ (jwhite__!~jwhite@75-146-153-89-minnesota.hfc.comcastbusiness.net) has joined #mythtv | |
| [20:00:30] | j-rod: | not just git push -n, but git push -n origin mythtv-rec:…. (the rest of the command from Beirdo) |
| [20:00:40] | jwhite__ (jwhite__!~jwhite@75-146-153-89-minnesota.hfc.comcastbusiness.net) has quit (Remote host closed the connection) | |
| [20:00:44] | j-rod: | or was that what you did? |
| [20:01:11] | danielk22: | j-rod: no, but I just tried that and it may have done something :) |
| [20:01:43] | Beirdo: | the -n keeps it from actually pushing (just like make -n) |
| [20:01:49] | elmojo: | ok, I updated http://svn.mythtv.org/trac/wiki/UsingGit... let me know if anyone sees something not exactly correct |
| [20:01:56] | Beirdo: | does everything but actually do the push in hte end |
| [20:02:12] | danielk22: | so.. I should try again without the -n ? |
| [20:03:04] | jannau: | danielk22: you could paste the output and we could look to make sure |
| [20:03:19] | danielk22: | To git@github.com :MythTV/mythtv.git |
| [20:03:20] | danielk22: | da948b2..2887c4a mythtv-rec -> dkristjansson/mythtv-rec |
| [20:03:26] | Beirdo: | if it did what you expected, then the next step is to take off the -n |
| [20:03:28] | jannau: | but it should be ok |
| [20:03:38] | jannau: | danielk22: looks good |
| [20:03:46] | Beirdo: | yup, looks good :) |
| [20:03:56] | danielk22: | w00t! |
| [20:07:28] | stuartm: | iamlindoro: if you still need that iplayer change testing I can do it now |
| [20:08:58] | Beirdo: | and I see a merge from master into your branch on github. cool |
| [20:11:10] | iamlindoro: | stuartm: make the contents of $Prefix/mythtv/internetcontent/nv_python_libs/configs/HTML/bbciplayer.html as follows: http://mythtv.pastebin.ca/2014097 |
| [20:11:40] | iamlindoro: | stuartm: That's on the BE, btw |
| [20:12:35] | iamlindoro: | stuartm: Then please try the following URL from a browser (not from myth) |
| [20:12:44] | iamlindoro: | stuartm: YOURBACKENDIP:6544/Myth/GetInternetContent?Grabber=nv_python_libs/configs/HTML/b bciplayer.html&videocode=b00w6bzp |
| [20:12:53] | iamlindoro: | And please try to play the content |
| [20:16:26] | stuartm: | seems to work fine |
| [20:16:28] | danielk22: | ok.. I did the second merge and there were no conflicts but it did not auto-commit.. Is that normal? It doesn't jibe with my reading of the docs + I ended up with two "Merge" commits for one merge. |
| [20:16:32] | iamlindoro: | Beautiful |
| [20:16:50] | stuartm: | plays poorly, but that's flash |
| [20:16:56] | iamlindoro: | stuartm: Thank you for testing-- feel free to keep it there-- still doesn't work with remote control but is a better player nonetheless |
| [20:17:06] | iamlindoro: | I'll be pushing that change to master in a bit |
| [20:17:27] | stuartm: | iamlindoro: surprised it worked tbh, I noticed the googleapi stuff in there and expected my router to block it |
| [20:17:50] | iamlindoro: | stuartm: Why would your router block it? |
| [20:18:10] | iamlindoro: | that JS is included in all the new remote-controllable HTML pages |
| [20:18:15] | stuartm: | because it's setup to block pretty much all google tracking stuff |
| [20:18:24] | iamlindoro: | it's the code that we use to embed the flash player |
| [20:18:26] | stuartm: | as I know a lot of people do |
| [20:18:51] | iamlindoro: | it doesn't performa any tracking-- anything that blocks that JS would be extremely overzealous |
| [20:19:10] | stuartm: | iamlindoro: that's nieve IMHO |
| [20:19:21] | stuartm: | but nevermind, those of us fighting the google war have to pay a heavy price |
| [20:19:21] | iamlindoro: | stuartm: No, it's informed |
| [20:19:29] | iamlindoro: | since I've read the js |
| [20:19:44] | stuartm: | iamlindoro: heh, they log all http traffic |
| [20:20:01] | stuartm: | it's not the javascript doing the tracking,it's the actual http server |
| [20:20:22] | iamlindoro: | stuartm: You you are averse to even loading a file off of a google server? If I'm naive, then you're a tinfoil hat wearing conspiracy theorist |
| [20:21:24] | iamlindoro: | http://code.google.com/p/swfobject/wiki/hosted_library |
| [20:21:25] | stuartm: | iamlindoro: so be it :) |
| [20:23:18] | jannau: | danielk22: no, your second merge commit reverts all changes the merge did |
| [20:23:24] | stuartm: | fwiw if that code is static, it could just be copied into our source rather than pulling from google ... but that's upto you, I'm not really likely to use MNV very much since I can record the content I want to watch |
| [20:26:16] | danielk22: | jannau: why would it do this? |
| [20:26:31] | danielk22: | (and how do I undo it?) |
| [20:28:04] | jannau: | I have no idea would it has done that. can you reconstruct what you've done? |
| [20:28:08] | iamlindoro: | stuartm: I guess I sort of think of it like the rest of our internal versus external libraries-- if we don't have a compelling reason to suck it in (and thus be responsible for updating and managing it forevermore) then I'd rather not |
| [20:29:45] | jannau: | I guess we can live with rewritten history in mythrec |
| [20:30:02] | danielk22: | git merge remotes/origin/master ; git commit |
| [20:30:23] | danielk22: | git push origin mythtv-rec:dkristjansson/mythtv-rec |
| [20:32:27] | stuartm: | iamlindoro: fair enough, I just find google's behaviour extremely creepy so I avoid their products, if that makes me a nutcase then so be it I'm not going to try and persuade everyone else to see it the same way that I do |
| [20:34:29] | iamlindoro: | stuartm: I suspect someone who knew anything at all about javascript could probably get most of our grabbers working with remote control in a few hours work-- To me, if we have all of our grabbers responding to remote control, ToS compliant, and fullscreen (as four now are, with a couple more on the way), we instantly make products like Google TV (and even things like Boxee) irrelevant. I'm eager to see that |
| [20:35:12] | iamlindoro: | stuartm: Would be easy and fun to start adding things like a context-sensitive search in the video playback OSD ("Find more content like this on Youtube") and allow a "PiP" playback of the trailer, actor interviews, etc. |
| [20:35:55] | iamlindoro: | The SwfObject stuff appears to give us nice control over a great many SWF players, so it's just a nice tool to use-- I'm not averse to importing it, just wary too |
| [20:37:59] | iamlindoro: | Note that the kind of interaction with the player described above would certainly require more knowledge of the player than I have, so hopefully others become interested in the concept |
| [20:39:40] | sphery: | iamlindoro: especially with ABC/Disney, CBS, NBC (including Hulu), Fox, and Viacom (including Comedy Central) blocking Google TV |
| [20:45:21] | danielk22: | jannau: git revert -n mythtv-rec ; git commit ; git push origin mythtv-rec:dkristjansson/mythtv-rec ? |
| [20:46:40] | jannau: | danielk22: I've redone the merge. you need to have done something between the git merge and the commit |
| [20:47:05] | jannau: | the merge was without conflicts and auto committed |
| [20:47:41] | jannau: | a git commit directly after would have said 'nothing to commit' |
| [20:47:41] | danielk22: | jannau: so now I just pull and it will be hunky dory? |
| [20:49:20] | danielk22: | jannau: I think it may have something to do with the git-new-workdir or that my origin points to the master rather than the remote branch.. I looked through the history and didn't see any extra commands or params. |
| [20:50:39] | jannau: | I'm undecided if we should revert or remove the top commit |
| [20:51:46] | danielk22: | I think in this case it is safe to remove the top commit, I doubt there are many people following the branch that closely.. |
| [20:51:51] | jannau: | remotes/origin/HEAD being at the same same rev as origin master is correct |
| [20:53:33] | danielk22: | so I always need to specify the origin when pushing in mythtv-rec ? |
| [20:53:51] | jannau: | ok, then git update-ref refs/heads/mythtv-rec mythtv-rec^ |
| [20:54:16] | jannau: | git checkout mythtv-rec && git reset --hard |
| [20:55:34] | jannau: | check with git log that the branch is at 2eff118a00a37d23f0fca7aca1eb1e456bacb098 |
| [20:56:06] | jannau: | then git push -n -f origin mythtv-rec:dkristjansson/mythtv-rec |
| [20:57:06] | danielk22: | + 2323d74...2eff118 mythtv-rec -> dkristjansson/mythtv-rec (forced update) |
| [20:57:28] | jannau: | ok, remove the -n |
| [20:58:32] | danielk22: | thx |
| [21:04:09] | sphery: | danielk22: OK, it seems that the CPU-- and CPU+ example playback profile groups aren't actually deleted from existing databases--but they're not created in new ones, now. Based on http://www.mythtv.org/wiki/Playback_profiles , it looks like when we factor out XvMC, libmpeg2, and ivtv, we have nothing remarkable left of them, so is it OK for me to just delete them in the DB update? And I'm leaning toward just leaving ivtv stuff in ... |
| [21:04:15] | sphery: | ... custom profiles and letting users clean them up if necessary (since without knowing what other profiles exist in their customized group, I can't know the best way to modify the ivtv stuff). |
| [21:04:38] | sphery: | also, if you'd like to me modify the High Quality group, I just need to know what you'd like it to look like – http://www.mythtv.org/wiki/Playback_profiles# . . . ult_settings |
| [21:05:23] | jannau: | danielk22: git config --local --add push.default tracking is probably a good idea |
| [21:05:37] | jannau: | ^^^ that's for everyone |
| [21:06:06] | danielk22: | sphery: yes, so long as people using them get reassigned to some other playback profile. I think we can drop CPU++ too. |
| [21:06:37] | sphery: | OK. In that case, maybe I'll fix it to actually choose Normal, then, for new databases, too. |
| [21:06:42] | sphery: | thanks |
| [21:07:45] | jannau: | that changes the default behaviour of git push without options to push the current branch to the one it is tracking |
| [21:08:16] | jannau: | instead of pushing all matching branches (branches with the same name) |
| [21:08:51] | stuartm: | Beirdo: thanks for all the -commits changes, it's a lot better now |
| [21:12:44] | Beirdo: | no problemo :) |
| [21:13:13] | Beirdo: | I think the current idea is to go with 3 lists. -commits for master/fixes branch commits |
| [21:13:21] | Beirdo: | -tickets for tickets |
| [21:13:31] | Beirdo: | -branch-commits for the other spew |
| [21:13:48] | stuartm: | yeah that's what was proposed |
| [21:13:56] | Beirdo: | let people choose their desired spew level :) |
| [21:15:04] | Beirdo: | having good constructive criticism definitely makes it easier to get it the way people like. |
| [21:15:53] | Beirdo: | or at least not hate :0 |
| [21:33:39] | hellome (hellome!~hellome@c-69-253-65-8.hsd1.pa.comcast.net) has joined #mythtv | |
| [21:38:06] | hellome (hellome!~hellome@c-69-253-65-8.hsd1.pa.comcast.net) has quit (Ping timeout: 240 seconds) | |
| [22:06:35] | carmony_ (carmony_!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has quit (Ping timeout: 255 seconds) | |
| [22:07:02] | carmony (carmony!~justin@c-24-10-194-172.hsd1.ut.comcast.net) has joined #mythtv | |
| [22:17:01] | Kunalagon (Kunalagon!~Kunalagon@212.200.241.196) has joined #mythtv | |
| [22:22:34] | j-rod is now known as j-rod|afk | |
| [22:26:48] | iamlindoro: | OK, can someone give me a quick tutorial on backporting a fix to .24-fixes? |
| [22:27:29] | iamlindoro: | ie, I'm sitting on a checkout of master with some in-progress changes, but want to take the commit I just made and apply it to .24-fixes |
| [22:29:08] | stuartm: | iamlindoro: isn't it just "git checkout fixes/0.24; git cherrypick {commitref};git push"? |
| [22:29:21] | stuartm: | you'd need to stash first I guess |
| [22:29:33] | stuartm: | or commit those in-progress changes |
| [22:30:14] | stuartm: | or use git-new-workdir to work on 0.24 without disturbing in-progress work on master |
| [22:30:23] | superm1: | and make sure to git pull before you git cherrypick too |
| [22:31:50] | iamlindoro: | stuartm: Not need to git commit after the cherry-pick? |
| [22:31:55] | iamlindoro: | er No |
| [22:32:26] | stuartm: | iamlindoro: not afaik since you're picking something which has already been committed |
| [22:32:58] | stuartm: | might prompt you for a log message automatically, never tried it |
| [22:33:05] | iamlindoro: | K.... hopefully that just worked |
| [22:33:53] | iamlindoro: | Thanks for the help |
| [22:35:56] | gigem: | iamlindoro: you might want to use --edit with cherry-pick. that will let you edit the commit message to prefix it with "Backport...". |
| [22:36:13] | iamlindoro: | gigem: Ah, ok-- didn't even know about its existence. Thanks. |
| [22:37:38] | gigem: | np. fyi to you and anyone else. as long as you haven't pushed, you can also edit the last commit message with "git commit --amend". |
| [22:39:07] | iamlindoro: | I learned amend the other day-- I just sort of get lost in the misdirection of git-- It made sense to me up until the cherry-pick, at which point I don't quite get why it wouldn't require another commit, as to me they're distinct changes |
| [22:39:59] | iamlindoro: | ie one is a commit to master, the other a commit to .24-fixes |
| [22:40:10] | iamlindoro: | I recognize that this is probably me just being stuck in an svn mindset |
| [22:41:29] | iamlindoro: | I guess cherry-picking in git is more like gluing an existing branch of another tree onto a different tree right next to it? |
| [22:41:39] | iamlindoro: | That is a horrible metaphor, but maybe it makes sense :) |
| [22:41:50] | danielk22: | iamlindoro: or it's a same patch applied to both trees. If manual intervention was required to apply the patch only then is it a seperate patchset. |
| [22:42:25] | iamlindoro: | ok.... I'm sure it'll all click at some point. Thanks. |
| [22:42:52] | danielk22: | iamlindoro: obviously i'm no git expert, but I think you just need to think of it as a patch stack. quilt on every drug known to man. |
| [22:43:24] | iamlindoro: | Hehe, says he, unaware that quilt has never made sense to me either ;) |
| [22:43:40] | iamlindoro: | But I think I'm (slowly) beginning to catch on |
| [22:49:50] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has quit (Ping timeout: 245 seconds) | |
| [22:51:05] | Splat1 (Splat1!~Splat1@rf1.splat1.com) has quit (Ping timeout: 245 seconds) | |
| [22:51:55] | gigem: | i think it's just minor difference in philosophy and/or mechanics. svn leaves the commit and message composition to you while git tries to be helpful and do it all for you. if you like, i thing git cherry-pick with the -n/--no-commit option will essentially work like svn. |
| [22:52:47] | jannau: | iamlindoro: git commands do auto commit if they don't require manual intervention |
| [22:54:03] | jannau: | i.e. if a merge or cherry-pick end up without conflicts git doesn't bother you to commit manually |
| [22:54:16] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has joined #mythtv | |
| [22:55:08] | jannau: | iamlindoro: be careful with git push use -n/--dry-run first |
| [22:55:19] | Splat1 (Splat1!~Splat1@rf1.splat1.com) has joined #mythtv | |
| [22:55:37] | iamlindoro: | jannau: Any reason in particular, if I know what's being pushed? |
| [22:56:16] | jannau: | and never use git push -f if you're not 123% certain it is correct |
| [22:57:09] | jannau: | iamlindoro: git push without repo and refspec pushes per default all matching branches (same name) |
| [22:58:01] | iamlindoro: | See, I thought I was getting it, but now I'm more confused than ever-- I don't even know how multiple branches could have the same name, or what a refspec is |
| [22:58:31] | danielk22: | jannau: I can't parse that sentence. Can you explain "matching branches" better? Or point to a link about it? |
| [22:58:34] | jannau: | sorry, I was sloppy |
| [22:59:10] | jannau: | matching branches are branches with the same name in the local and remote repository |
| [22:59:25] | jannau: | i.e. master and origin/master |
| [23:00:39] | danielk22: | so "master" and "remotes/origin/master" are matching.. but "mythtv-rec" and "remotes/origin/dkristjansson/mythtv-rec" are not? |
| [23:00:45] | superm1: | that's why when you checkout 'fixes/0.24' it can know where to create a tracking branch from |
| [23:04:35] | jannau: | danielk22: yes |
| [23:05:11] | jannau: | superm1: git push doesn't use the tracking info with the default settings |
| [23:05:59] | jannau: | that can be changed with 'git config --local --add push.default tracking' |
| [23:10:14] | Steve_Goodey (Steve_Goodey!~steve@host86-145-237-137.range86-145.btcentralplus.com) has quit (Remote host closed the connection) | |
| [23:17:43] | Kunalagon (Kunalagon!~Kunalagon@212.200.241.196) has quit (Quit: Leaving.) | |
| [23:19:25] | Dave123-road (Dave123-road!~dave@cpe-74-74-222-96.rochester.res.rr.com) has quit (Remote host closed the connection) | |
| [23:19:26] | MaverickTech (MaverickTech!~MaverickT@dns2.arel.com.au) has joined #mythtv | |
| [23:19:38] | gkeen316 (gkeen316!~gkeen316@d75-156-147-11.abhsia.telus.net) has joined #mythtv | |
| [23:20:55] | Dave123-road (Dave123-road!~dave@74.74.222.96) has joined #mythtv | |
| [23:43:53] | Dave123 (Dave123!~dave@cpe-74-74-222-96.rochester.res.rr.com) has joined #mythtv | |
| [23:47:15] | markk_: | danielk22: I'm just testing a fix now – but I think there's a simple error that disables xvideo in trunk at the moment. The green flash is almost certainly the opengl deinterlacer operating on uninitialised frames (something I haven't fixed yet – known feature!) |
| [23:57:05] | markk_: | danielk22: should be fixed. and all before breakfast:) |
IRC Logs collected by
BeirdoBot.
Please use the above link to report any bugs.